Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv32023/stable/main/finkinfo/languages
Modified Files:
mono.info mono.patch
Log Message:
sync mono and nant to stable as dependency of ikvm in stable
Index: mono.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/mono.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mono.info 3 Sep 2009 02:07:18 -0000 1.4
+++ mono.info 20 Oct 2011 07:05:39 -0000 1.5
@@ -1,35 +1,33 @@
Info4: <<
Package: mono
-Version: 2.4
+Version: 2.6.4
Revision: 1
-Distribution: 10.4, 10.5
Architecture: i386, powerpc
Description: .NET-compatible CIL engine
Type: java(1.5)
License: LGPL
-Maintainer: Benjamin Reed <[email protected]>
+Maintainer: Benjamin Reed <[email protected]>
Depends: <<
%N-shlibs (= %v-%r),
- libgettext3-shlibs,
+ libgettext8-shlibs,
system-java15
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- cairo (>= 1.8.6-1),
+ atk1 (>= 1.26.0-1),
+ cairo (>= 1.8.8-1),
expat1,
- fink (>= 0.28.0-1),
+ fink (>= 0.29.7-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
- # gc (>= 7.1-1),
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.4-1),
glitz (>= 0.4.4-1),
- libgettext3-dev,
+ libgettext8-dev,
libiconv-dev,
libpng3,
- pixman (>= 0.12.0-1),
- pkgconfig (>= 0.22-3),
+ pixman (>= 0.16.0-1),
+ pkgconfig (>= 0.23-1),
system-java15-dev,
xmkmf
<<
@@ -40,19 +38,34 @@
<<
Source: http://ftp.novell.com/pub/mono/sources/%n/%n-%v.tar.bz2
-Source-MD5: da2bf1c0aba2958d26c5e8a9a49fd9d1
-PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
+Source-MD5: 342a7ca3bea3cbec0c8ac48b9322fcb4
+PatchScript: <<
+ sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
+ perl -pi -e 's,-pthread,-lpthread,g' configure
+<<
PatchFile: %n.patch
-PatchFile-MD5: c4ed22de8fd4fa31cee29051361a23ec
+PatchFile-MD5: 56340018a90f648384d24396f9085d76
+SetCFLAGS: -Os
SetCPPFLAGS: -I%p/include
-SetLDFLAGS: -bind_at_load
SetLIBS: -L%p/lib
SetMAKEFLAGS: -j1
+NoSetCFLAGS: true
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
-ConfigureParams: --build=%m-apple-darwin`uname -r|cut -f1 -d.`
--mandir=%p/share/man --sysconfdir=%p/etc --with-glib=system
--with-ikvm-native=yes --with-jit=yes --with-preview=yes --with-x
--with-moonlight --disable-dtrace --disable-dependency-tracking CFLAGS="-Os"
CXXFLAGS="-Os"
+ConfigureParams: <<
+--with-ikvm-native=yes \
+--mandir=%p/share/man \
+--sysconfdir=%p/etc \
+--with-glib=system \
+--with-preview=yes \
+--with-x \
+--with-moonlight \
+--without-sigaltstack \
+--disable-dtrace \
+--disable-dependency-tracking
+<<
CompileScript: <<
#!/bin/sh -ex
@@ -79,15 +92,12 @@
export XGETTEXT="%p/bin/xgettext"
export XMKMF="%p/lib/xmkmf/bin/xmkmf"
-# if [ "%m" = "x86_64" ]; then
-# export CFLAGS="$CFLAGS -arch x86_64"
-# export CXXFLAGS="$CXXFLAGS -arch x86_64"
-# export CPPFLAGS="$CPPFLAGS -arch x86_64"
-# fi
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC="gcc-4.2" CXX="g++-4.2"
+ fi
perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g;
s/need_relink=yes/need_relink=no/g' configure ltmain.sh
./configure %c --with-jdk=$JAVA_HOME
-
make
<<
@@ -113,9 +123,8 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- cairo-shlibs (>= 1.8.6-1),
- # gc-shlibs (>= 7.1-1),
- glib2-shlibs (>= 2.14.0-1),
+ cairo-shlibs (>= 1.8.8-1),
+ glib2-shlibs (>= 2.18.4-1),
macosx (>= 10.4.3-1)
<<
Replaces: %N (<< %v-%r)
Index: mono.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/mono.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mono.patch 2 Jul 2009 00:09:25 -0000 1.2
+++ mono.patch 20 Oct 2011 07:05:39 -0000 1.3
@@ -1,8 +1,8 @@
-diff -Nurd mono-2.4/configure mono-2.4-new/configure
---- mono-2.4/configure 2009-03-13 10:51:11.000000000 -0400
-+++ mono-2.4-new/configure 2009-05-21 11:40:07.000000000 -0400
-@@ -3029,11 +3029,11 @@
- *-*-darwin*)
+diff -Nurd mono-2.6.4/configure mono-2.6.4-new/configure
+--- mono-2.6.4/configure 2010-04-22 10:53:03.000000000 -0500
++++ mono-2.6.4-new/configure 2010-04-30 22:27:50.000000000 -0500
+@@ -3222,11 +3222,11 @@
+ parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
platform_win32=no
platform_darwin=yes
- CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE
-DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
@@ -16,16 +16,27 @@
need_link_unlink=yes
cat >>confdefs.h <<\_ACEOF
#define PTHREAD_POINTER_ID 1
-@@ -22546,20 +22546,12 @@
+@@ -3246,7 +3246,7 @@
+ fi
+ case "$host" in
+ i*86-*-darwin10*)
+- BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE
-mmacosx-version-min=10.5"
++ BROKEN_DARWIN_FLAGS="-D_XOPEN_SOURCE
-mmacosx-version-min=10.5"
+ CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS"
+ CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS"
+ CXXFLAGS="$CXXFLAGS $BROKEN_DARWIN_FLAGS"
+@@ -18249,20 +18249,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <zlib.h>
-int
-main ()
-{
--
- void main () {
+
+- void main () {
++ int main () {
#if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
++ return 0;
}
#else
#error No good zlib found
@@ -37,7 +48,56 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -40039,11 +40031,11 @@
+@@ -23692,18 +23686,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sched.h>
+-int
+-main ()
+-{
+-
+ int main() {
+ int mask = 1;
+ sched_setaffinity(0, &mask);
++ return 0;
+ }
+-
+- ;
+- return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -36761,11 +36748,11 @@
+
+ JIT_SUPPORTED=no
+ INTERP_SUPPORTED=no
+-LIBC="libc.so.6"
+-INTL="libc.so.6"
+-SQLITE="libsqlite.so.0"
+-SQLITE3="libsqlite3.so.0"
+-X11="libX11.so"
++LIBC="/usr/lib/libSystem.dylib"
++INTL="@FINKPREFIX@/lib/libintl.dylib"
++SQLITE="@FINKPREFIX@/lib/libsqlite.0.dylib"
++SQLITE3="@FINKPREFIX@/lib/libsqlite3.0.dylib"
++X11="/usr/X11R6/lib/libX11.6.dylib"
+
+ sizeof_register="SIZEOF_VOID_P"
+
+@@ -36796,11 +36783,9 @@
+ main ()
+ {
+
+- void main () {
+ #if _MIPS_SIM != _ABIN32
+ #error Not mips n32
+ #endif
+- }
+
+ ;
+ return 0;
+@@ -37247,11 +37232,11 @@
case "$host" in
*-*-darwin*)
libsuffix=".dylib"
@@ -54,10 +114,10 @@
;;
*-*-*netbsd*)
LIBC="libc.so.12"
-diff -Nurd mono-2.4/data/config.in mono-2.4-new/data/config.in
---- mono-2.4/data/config.in 2009-02-13 18:34:32.000000000 -0500
-+++ mono-2.4-new/data/config.in 2009-05-21 11:40:07.000000000 -0400
-@@ -5,18 +5,18 @@
+diff -Nurd mono-2.6.4/data/config.in mono-2.6.4-new/data/config.in
+--- mono-2.6.4/data/config.in 2010-04-22 10:37:47.000000000 -0500
++++ mono-2.6.4-new/data/config.in 2010-04-30 22:27:50.000000000 -0500
+@@ -5,19 +5,19 @@
<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@"
os="solaris"/>
<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@"
os="solaris"/>
<dllmap dll="libintl" target="@INTL@" os="!windows"/>
@@ -79,14 +139,80 @@
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
- <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
+- <dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
+ <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/libcairo.2.dylib"
os="!windows"/>
++ <dllmap dll="libcups" target="/usr/lib/libcups.2.dylib" os="!windows"/>
<dllmap dll="i:kernel32.dll">
<dllentry dll="__Internal" name="CopyMemory"
target="mono_win32_compat_CopyMemory"/>
<dllentry dll="__Internal" name="FillMemory"
target="mono_win32_compat_FillMemory"/>
-diff -Nurd mono-2.4/mono/io-layer/shared.c mono-2.4-new/mono/io-layer/shared.c
---- mono-2.4/mono/io-layer/shared.c 2009-02-13 18:33:11.000000000 -0500
-+++ mono-2.4-new/mono/io-layer/shared.c 2009-05-21 12:09:10.000000000
-0400
-@@ -53,8 +53,8 @@
+diff -Nurd mono-2.6.4/libgc/darwin_stop_world.c
mono-2.6.4-new/libgc/darwin_stop_world.c
+--- mono-2.6.4/libgc/darwin_stop_world.c 2010-04-22 10:37:43.000000000
-0500
++++ mono-2.6.4-new/libgc/darwin_stop_world.c 2010-04-30 22:27:50.000000000
-0500
+@@ -135,7 +135,7 @@
+ GC_push_one(state.ebp);
+ #endif
+ #elif defined(POWERPC)
+-#if defined(_STRUCT_PPC_EXCEPTION_STATE)
++#if __DARWIN_UNIX03
+ lo = (void*)(state.__r1 - PPC_RED_ZONE_SIZE);
+
+ GC_push_one(state.__r0);
+@@ -278,7 +278,7 @@
+ (natural_t *)&info, &outCount);
+ if(r != KERN_SUCCESS) continue;
+
+-#if defined(_STRUCT_PPC_EXCEPTION_STATE)
++#if __DARWIN_UNIX03
+ 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_FALSE@runtime_lib = ../interpreter/libmint.la
+ @JIT_SUPPORTED_TRUE@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
+@@ -120,8 +120,8 @@
+ void
+ mono_interp_transform_init (void);
+
+-void inline stackval_from_data (MonoType *type, stackval *result, char *data,
gboolean pinvoke);
+-void inline stackval_to_data (MonoType *type, stackval *val, char *data,
gboolean pinvoke);
++void stackval_from_data (MonoType *type, stackval *result, char *data,
gboolean pinvoke);
++void stackval_to_data (MonoType *type, stackval *val, char *data, gboolean
pinvoke);
+ 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
+@@ -168,8 +168,8 @@
ubuf.machine[0] = '\0';
ubuf.sysname[0] = '\0';
} else {
@@ -97,21 +223,21 @@
}
fake_name = g_getenv ("MONO_SHARED_HOSTNAME");
-diff -Nurd mono-2.4/mono/metadata/loader.c mono-2.4-new/mono/metadata/loader.c
---- mono-2.4/mono/metadata/loader.c 2009-02-23 13:43:32.000000000 -0500
-+++ mono-2.4-new/mono/metadata/loader.c 2009-05-21 11:40:07.000000000
-0400
-@@ -1196,6 +1196,24 @@
+diff -Nurd mono-2.6.4/mono/metadata/loader.c
mono-2.6.4-new/mono/metadata/loader.c
+--- mono-2.6.4/mono/metadata/loader.c 2010-04-22 10:37:44.000000000 -0500
++++ mono-2.6.4-new/mono/metadata/loader.c 2010-04-30 22:27:50.000000000
-0500
+@@ -1284,6 +1284,24 @@
if (!module) {
void *iter = NULL;
+ while ((full_name = mono_dl_build_path
("@FINKPREFIX@/lib", file_name, &iter))) {
+ mono_trace (G_LOG_LEVEL_INFO,
MONO_TRACE_DLLIMPORT,
-+ "DllImport loading library: '%s'.",
full_name);
++ "DllImport loading location:
'%s'.", full_name);
+ module = cached_module_load (full_name,
MONO_DL_LAZY, &error_msg);
+ if (!module) {
+ mono_trace (G_LOG_LEVEL_INFO,
MONO_TRACE_DLLIMPORT,
-+ "DllImport error loading
library '%s'.",
-+ error_msg);
++ "DllImport error
loading library: '%s'.",
++ error_msg);
+ g_free (error_msg);
+ }
+ g_free (full_name);
@@ -122,41 +248,111 @@
+
+ if (!module) {
+ void *iter = NULL;
- while ((full_name = mono_dl_build_path (".", file_name,
&iter))) {
+ while ((full_name = mono_dl_build_path (NULL,
file_name, &iter))) {
mono_trace (G_LOG_LEVEL_INFO,
MONO_TRACE_DLLIMPORT,
- "DllImport loading library: '%s'.",
full_name);
-diff -Nurd mono-2.4/mono/mini/exceptions-amd64.c
mono-2.4-new/mono/mini/exceptions-amd64.c
---- mono-2.4/mono/mini/exceptions-amd64.c 2009-03-09 12:51:42.000000000
-0400
-+++ mono-2.4-new/mono/mini/exceptions-amd64.c 2009-05-21 11:40:07.000000000
-0400
-@@ -740,7 +740,7 @@
- static inline guint64*
- gregs_from_ucontext (ucontext_t *ctx)
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__APPLE__)
- guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
- #else
- guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
-diff -Nurd mono-2.4/mono/mini/mini-amd64.h mono-2.4-new/mono/mini/mini-amd64.h
---- mono-2.4/mono/mini/mini-amd64.h 2009-02-13 18:34:26.000000000 -0500
-+++ mono-2.4-new/mono/mini/mini-amd64.h 2009-05-21 11:40:07.000000000
-0400
-@@ -213,7 +213,9 @@
+ "DllImport loading location:
'%s'.", full_name);
+diff -Nurd mono-2.6.4/mono/metadata/profiler.c
mono-2.6.4-new/mono/metadata/profiler.c
+--- mono-2.6.4/mono/metadata/profiler.c 2010-04-22 10:37:44.000000000
-0500
++++ mono-2.6.4-new/mono/metadata/profiler.c 2010-04-30 22:27:50.000000000
-0500
+@@ -26,7 +26,7 @@
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+-#ifdef HAVE_BACKTRACE_SYMBOLS
++#if defined(HAVE_BACKTRACE_SYMBOLS) && defined(HAVE_EXECINFO_H)
+ #include <execinfo.h>
+ #endif
- #ifndef PLATFORM_WIN32
+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
+@@ -4794,10 +4794,15 @@
+ MonoJumpInfo *patch_info;
+ int i;
+ guint8 *code;
+- const guint8* exc_throw_pos [MONO_EXC_INTRINS_NUM] = {NULL};
+- guint8 exc_throw_found [MONO_EXC_INTRINS_NUM] = {0};
++ guint8* exc_throw_pos [MONO_EXC_INTRINS_NUM];
++ guint8 exc_throw_found [MONO_EXC_INTRINS_NUM];
+ int max_epilog_size = 50;
-+#ifndef __APPLE__
++ for (i = 0; i < MONO_EXC_INTRINS_NUM; i++) {
++ exc_throw_pos [i] = NULL;
++ exc_throw_found [i] = 0;
++ }
++
+ /* count the number of exception infos */
+
+ /*
+diff -Nurd mono-2.6.4/mono/mini/mini-ppc.c mono-2.6.4-new/mono/mini/mini-ppc.c
+--- mono-2.6.4/mono/mini/mini-ppc.c 2010-04-22 10:37:45.000000000 -0500
++++ mono-2.6.4-new/mono/mini/mini-ppc.c 2010-04-30 22:28:15.000000000
-0500
+@@ -5365,10 +5365,15 @@
+ MonoJumpInfo *patch_info;
+ int i;
+ guint8 *code;
+- const guint8* exc_throw_pos [MONO_EXC_INTRINS_NUM] = {NULL};
+- guint8 exc_throw_found [MONO_EXC_INTRINS_NUM] = {0};
++ guint8* exc_throw_pos [MONO_EXC_INTRINS_NUM];
++ guint8 exc_throw_found [MONO_EXC_INTRINS_NUM];
+ int max_epilog_size = 50;
+
++ for (i = 0; i < MONO_EXC_INTRINS_NUM; i++) {
++ exc_throw_pos [i] = NULL;
++ exc_throw_found [i] = 0;
++ }
++
+ /* count the number of exception infos */
+
+ /*
+diff -Nurd mono-2.6.4/mono/mini/mini-ppc.h mono-2.6.4-new/mono/mini/mini-ppc.h
+--- mono-2.6.4/mono/mini/mini-ppc.h 2010-04-22 10:37:45.000000000 -0500
++++ mono-2.6.4-new/mono/mini/mini-ppc.h 2010-04-30 22:27:50.000000000
-0500
+@@ -277,9 +277,9 @@
+
+ #if defined(__linux__)
#define MONO_ARCH_USE_SIGACTION 1
-+#endif
+-#elif defined (__APPLE__) && defined (_STRUCT_MCONTEXT)
++#elif defined (__APPLE__) && __DARWIN_UNIX03
+ #define MONO_ARCH_USE_SIGACTION 1
+-#elif defined (__APPLE__) && !defined (_STRUCT_MCONTEXT)
++#elif defined (__APPLE__) && !__DARWIN_UNIX03
+ #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)
- #ifdef HAVE_WORKING_SIGALTSTACK
+ INCLUDES = \
+- $(GLIB_CFLAGS) \
+- -I$(top_srcdir)
++ -I$(top_srcdir) $(GLIB_CFLAGS)
-@@ -319,7 +321,9 @@
- #define MONO_ARCH_MONITOR_OBJECT_REG AMD64_RDI
- #endif
-+#if !defined(__APPLE__)
- #define MONO_ARCH_AOT_SUPPORTED 1
-+#endif
+ # 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
+@@ -8,6 +8,7 @@
+ */
- #if !defined(PLATFORM_WIN32) || defined(__sun)
- #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1
+ #define _XOPEN_SOURCE 600
++#undef _NONSTD_SOURCE
+
+ #include <sys/types.h>
+ #include <sys/mman.h>
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Ciosco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
