Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24692
Modified Files: mono.info mono.patch Log Message: local -I before global (caught by jfm, makefile patches by dmacks) Index: mono.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/mono.info,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mono.info 1 May 2010 15:02:05 -0000 1.22 +++ mono.info 9 Aug 2010 07:10:47 -0000 1.23 @@ -44,7 +44,7 @@ perl -pi -e 's,-pthread,-lpthread,g' configure << PatchFile: %n.patch -PatchFile-MD5: 112c7e332abdabd158a9b11b02fd5eba +PatchFile-MD5: 56340018a90f648384d24396f9085d76 SetCFLAGS: -Os SetCPPFLAGS: -I%p/include Index: mono.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/mono.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mono.patch 1 May 2010 15:02:05 -0000 1.10 +++ mono.patch 9 Aug 2010 07:10:48 -0000 1.11 @@ -166,6 +166,18 @@ lo = (void*)(info.__r1 - PPC_RED_ZONE_SIZE); hi = (ptr_t)FindTopOfStack(info.__r1); +diff -Nurd mono-2.6.4/mono/dis/Makefile.in mono-2.6.4-new/mono/dis/Makefile.in +--- mono-2.6.4/mono/dis/Makefile.in 2010-04-22 11:53:00.000000000 -0400 ++++ mono-2.6.4-new/mono/dis/Makefile.in 2010-08-09 02:20:15.000000000 -0400 +@@ -273,7 +273,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) ++INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) + @jit_supported_fa...@runtime_lib = ../interpreter/libmint.la + @jit_supported_t...@runtime_lib = ../mini/libmono.la + noinst_LIBRARIES = libmonodis.a diff -Nurd mono-2.6.4/mono/interpreter/interp.h mono-2.6.4-new/mono/interpreter/interp.h --- mono-2.6.4/mono/interpreter/interp.h 2010-04-22 10:37:47.000000000 -0500 +++ mono-2.6.4-new/mono/interpreter/interp.h 2010-04-30 22:27:50.000000000 -0500 @@ -180,6 +192,23 @@ void ves_exec_method (MonoInvocation *frame); /* +diff -Nurd mono-2.6.4/mono/io-layer/Makefile.in mono-2.6.4-new/mono/io-layer/Makefile.in +--- mono-2.6.4/mono/io-layer/Makefile.in 2010-04-22 11:53:00.000000000 -0400 ++++ mono-2.6.4-new/mono/io-layer/Makefile.in 2010-08-09 02:53:05.000000000 -0400 +@@ -309,10 +309,10 @@ + top_srcdir = @top_srcdir@ + noinst_LTLIBRARIES = libwapi.la + INCLUDES = \ +- $(GLIB_CFLAGS) \ ++ -I$(top_srcdir) \ + $(LIBGC_CFLAGS) \ +- -DMONO_BINDIR=\""$(bindir)"\" \ +- -I$(top_srcdir) ++ $(GLIB_CFLAGS) \ ++ -DMONO_BINDIR=\""$(bindir)"\" + + libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer + OTHER_H = \ diff -Nurd mono-2.6.4/mono/io-layer/shared.c mono-2.6.4-new/mono/io-layer/shared.c --- mono-2.6.4/mono/io-layer/shared.c 2010-04-22 10:37:44.000000000 -0500 +++ mono-2.6.4-new/mono/io-layer/shared.c 2010-04-30 22:27:50.000000000 -0500 @@ -234,6 +263,18 @@ #include <execinfo.h> #endif +diff -Nurd mono-2.6.4/mono/mini/Makefile.in mono-2.6.4-new/mono/mini/Makefile.in +--- mono-2.6.4/mono/mini/Makefile.in 2010-04-22 11:53:01.000000000 -0400 ++++ mono-2.6.4-new/mono/mini/Makefile.in 2010-08-09 00:33:42.000000000 -0400 +@@ -485,7 +485,7 @@ + RUNTIME_AOTCHECK = MONO_PATH=$(CLASS):. $(top_builddir)/runtime/mono-wrapper + MCS = $(RUNTIME) $(CLASS)/gmcs.exe -unsafe -nowarn:0162 + ILASM = $(RUNTIME) $(CLASS)/ilasm.exe +-AM_CFLAGS = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(LIBGC_CFLAGS) \ + $(GLIB_CFLAGS) \ diff -Nurd mono-2.6.4/mono/mini/mini-arm.c mono-2.6.4-new/mono/mini/mini-arm.c --- mono-2.6.4/mono/mini/mini-arm.c 2010-04-22 10:37:45.000000000 -0500 +++ mono-2.6.4-new/mono/mini/mini-arm.c 2010-04-30 22:28:15.000000000 -0500 @@ -291,6 +332,19 @@ #define MONO_ARCH_USE_SIGACTION 1 #elif defined(__NetBSD__) #define MONO_ARCH_USE_SIGACTION 1 +diff -Nurd mono-2.6.4/support/Makefile.in mono-2.6.4-new/support/Makefile.in +--- mono-2.6.4/support/Makefile.in 2010-04-22 11:53:02.000000000 -0400 ++++ mono-2.6.4-new/support/Makefile.in 2010-08-09 00:55:57.000000000 -0400 +@@ -321,8 +321,7 @@ + $(SUPPORT) + + INCLUDES = \ +- $(GLIB_CFLAGS) \ +- -I$(top_srcdir) ++ -I$(top_srcdir) $(GLIB_CFLAGS) + + + # Source code which helps implement the ANSI C standards, and thus *should* be diff -Nurd mono-2.6.4/support/sys-mman.c mono-2.6.4-new/support/sys-mman.c --- mono-2.6.4/support/sys-mman.c 2010-04-22 10:37:47.000000000 -0500 +++ mono-2.6.4-new/support/sys-mman.c 2010-04-30 22:27:50.000000000 -0500 ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs