Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23197/10.3/unstable/main/finkinfo/languages
Modified Files:
mono.info mono.patch
Log Message:
mono fixes, should build on intel now
Index: mono.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/mono.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- mono.info 24 Oct 2006 02:30:58 -0000 1.25
+++ mono.info 11 Nov 2006 18:55:34 -0000 1.26
@@ -1,5 +1,5 @@
Package: mono
-Version: 1.1.18
+Version: 1.2
Revision: 11
Description: .NET-compatible CIL engine
Type: java(1.4)
@@ -11,12 +11,14 @@
BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev
CustomMirror: <<
+ Primary: http://ranger.users.finkproject.org/distfiles
+ eur-NL: http://ranger.users.finkproject.org/distfiles
nam-US: http://ranger.befunk.com/fink
- nam-US: http://astrange.ithinksw.net/ranger-fink
+ nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Source: http://go-mono.com/sources/%n/%n-%v.tar.gz
-Source-MD5: ce7c16c15b938edb2f1ea781921ef3eb
+Source-MD5: eb75a8b3bedbaa60ff3c3410ef4b759b
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
SetCPPFLAGS: -I%p/include
Index: mono.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/mono.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mono.patch 25 Oct 2006 15:02:02 -0000 1.12
+++ mono.patch 11 Nov 2006 18:55:34 -0000 1.13
@@ -1,7 +1,7 @@
---- mono-1.1.18/configure 2006-10-12 14:25:26.000000000 -0400
-+++ mono-1.1.18-new/configure 2006-10-23 19:49:21.000000000 -0400
-@@ -35597,7 +35597,7 @@
+--- mono-1.2/configure 2006-11-02 13:16:04.000000000 -0500
++++ mono-1.2-new/configure 2006-11-10 14:26:01.000000000 -0500
+@@ -36090,7 +36090,7 @@
INTL="libintl.dylib"
SQLITE="libsqlite.0.dylib"
SQLITE3="libsqlite3.0.dylib"
@@ -10,9 +10,9 @@
;;
*-*-*netbsd*)
LIBC="libc.so.12"
---- mono-1.1.18/data/config.in 2006-10-11 20:10:31.000000000 -0400
-+++ mono-1.1.18-new/data/config.in 2006-10-23 19:52:10.000000000 -0400
-@@ -1,18 +1,17 @@
+--- mono-1.2/data/config.in 2006-11-02 13:09:52.000000000 -0500
++++ mono-1.2-new/data/config.in 2006-11-10 14:26:01.000000000 -0500
+@@ -1,18 +1,18 @@
<configuration>
- <dllmap dll="cygwin1.dll" target="@LIBC@" />
- <dllmap dll="libc" target="@LIBC@" />
@@ -20,15 +20,15 @@
- <dllmap dll="libintl" target="@INTL@" />
- <dllmap dll="libxslt.dll" target="[EMAIL PROTECTED]@" />
- <dllmap dll="libmySQL.dll" target="[EMAIL PROTECTED]@" />
-- <dllmap dll="odbc32.dll" target="[EMAIL PROTECTED]@" />
+ <dllmap dll="cygwin1.dll" target="/usr/lib/[EMAIL PROTECTED]@" />
+ <dllmap dll="libc" target="/usr/lib/[EMAIL PROTECTED]@" />
+ <dllmap dll="intl" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@" />
+ <dllmap dll="libintl" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@" />
+ <dllmap dll="libxslt.dll" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@"
/>
+ <dllmap dll="libmySQL.dll" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@"
/>
+ <dllmap dll="odbc32.dll" target="[EMAIL PROTECTED]@" />
<dllmap os="osx" dll="odbc32.dll" target="libiodbc.dylib" />
-- <dllmap dll="oci" target="[EMAIL PROTECTED]@" />
+- <dllmap dll="oci" target="[EMAIL PROTECTED]@" os="!windows"/>
- <dllmap dll="db2cli" target="[EMAIL PROTECTED]@" />
- <dllmap dll="msvcrt" target="@LIBC@" />
- <dllmap dll="MonoPosixHelper" target="[EMAIL PROTECTED]@" />
@@ -36,17 +36,92 @@
- <dllmap dll="sqlite3" target="@SQLITE3@" />
- <dllmap dll="libX11" target="@X11@" />
- <dllmap dll="libcairo-2.dll" target="libcairo.so.2" />
-+ <dllmap dll="oci" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@" />
-+ <dllmap dll="db2cli" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@"/>
-+ <dllmap dll="msvcrt" target="/usr/lib/[EMAIL PROTECTED]@"/>
-+ <dllmap dll="MonoPosixHelper" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@"/>
-+ <dllmap dll="sqlite" target="@FINKPREFIX@/lib/@SQLITE@"/>
-+ <dllmap dll="sqlite3" target="@FINKPREFIX@/lib/@SQLITE3@"/>
-+ <dllmap dll="libX11" target="/usr/X11R6/lib/@X11@"/>
-+ <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@"/>
++ <dllmap dll="oci" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@"
os="!windows"/>
++ <dllmap dll="db2cli" target="@FINKPREFIX@/lib/[EMAIL PROTECTED]@" />
++ <dllmap dll="msvcrt" target="/usr/lib/[EMAIL PROTECTED]@" />
++ <dllmap dll="MonoPosixHelper" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@" />
++ <dllmap dll="sqlite" target="@FINKPREFIX@/lib/@SQLITE@" />
++ <dllmap dll="sqlite3" target="@FINKPREFIX@/lib/@SQLITE3@" />
++ <dllmap dll="libX11" target="/usr/X11R6/lib/@X11@" />
++ <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@" />
</configuration>
---- mono-1.1.18/mono/metadata/Makefile.in 2006-10-12 14:25:18.000000000
-0400
-+++ mono-1.1.18-new/mono/metadata/Makefile.in 2006-10-23 19:49:21.000000000
-0400
+--- mono-1.2/libgc/darwin_stop_world.c 2006-10-11 20:10:13.000000000 -0400
++++ mono-1.2-new/libgc/darwin_stop_world.c 2006-11-10 14:26:29.000000000
-0500
+@@ -75,12 +75,14 @@
+ ptr_t lo, hi;
+ #if defined(POWERPC)
+ ppc_thread_state_t state;
++ mach_msg_type_number_t thread_state_count = PPC_THREAD_STATE_COUNT;
+ #elif defined(I386)
+ i386_thread_state_t state;
++ mach_msg_type_number_t thread_state_count = i386_THREAD_STATE_COUNT;
+ #else
+ # error FIXME for non-x86 || ppc architectures
+-#endif
+ mach_msg_type_number_t thread_state_count = MACHINE_THREAD_STATE_COUNT;
++#endif
+
+ me = pthread_self();
+ if (!GC_thr_initialized) GC_thr_init();
+@@ -94,7 +96,7 @@
+ /* Get the thread state (registers, etc) */
+ r = thread_get_state(
+ p->stop_info.mach_thread,
+- MACHINE_THREAD_STATE,
++ GC_MACH_THREAD_STATE_FLAVOR,
+ (natural_t*)&state,
+ &thread_state_count);
+ if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
+@@ -193,7 +195,7 @@
+ ppc_thread_state64_t info;
+ # endif
+ mach_msg_type_number_t outCount = THREAD_STATE_MAX;
+- r = thread_get_state(thread, MACHINE_THREAD_STATE,
++ r = thread_get_state(thread, GC_MACH_THREAD_STATE_FLAVOR,
+ (natural_t *)&info, &outCount);
+ if(r != KERN_SUCCESS) continue;
+
+@@ -236,7 +238,7 @@
+ WARN("This is completely untested and likely will not work\n", 0);
+ i386_thread_state_t info;
+ mach_msg_type_number_t outCount = THREAD_STATE_MAX;
+- r = thread_get_state(thread, MACHINE_THREAD_STATE,
++ r = thread_get_state(thread, GC_MACH_THREAD_STATE_FLAVOR,
+ (natural_t *)&info, &outCount);
+ if(r != KERN_SUCCESS) continue;
+
+--- mono-1.2/libgc/include/private/gc_priv.h 2006-07-05 17:55:42.000000000
-0400
++++ mono-1.2-new/libgc/include/private/gc_priv.h 2006-11-10
14:27:02.000000000 -0500
+@@ -366,6 +366,16 @@
+ # define BZERO(x,n) bzero((char *)(x),(int)(n))
+ # endif
+
++#if defined(DARWIN)
++# if defined(POWERPC)
++# define GC_MACH_THREAD_STATE_FLAVOR PPC_THREAD_STATE
++# elif defined(I386)
++# define GC_MACH_THREAD_STATE_FLAVOR i386_THREAD_STATE
++# else
++# define GC_MACH_THREAD_STATE_FLAVOR MACHINE_THREAD_STATE
++# endif
++#endif
++
+ /* Delay any interrupts or signals that may abort this thread. Data */
+ /* structures are in a consistent state outside this pair of calls. */
+ /* ANSI C allows both to be empty (though the standard isn't very */
+--- mono-1.2/libgc/os_dep.c 2006-07-05 17:55:43.000000000 -0400
++++ mono-1.2-new/libgc/os_dep.c 2006-11-10 14:27:14.000000000 -0500
+@@ -3702,7 +3702,7 @@
+ mask,
+ GC_ports.exception,
+ EXCEPTION_DEFAULT,
+- MACHINE_THREAD_STATE
++ GC_MACH_THREAD_STATE_FLAVOR
+ );
+ if(r != KERN_SUCCESS) ABORT("task_set_exception_ports failed");
+
+--- mono-1.2/mono/metadata/Makefile.in 2006-11-02 13:15:57.000000000 -0500
++++ mono-1.2-new/mono/metadata/Makefile.in 2006-11-10 14:26:01.000000000
-0500
@@ -67,7 +67,7 @@
am_libmonoruntime_static_la_OBJECTS = $(am__objects_1)
libmonoruntime_static_la_OBJECTS = \
@@ -56,8 +131,8 @@
am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \
decimal.lo boehm-gc.lo null-gc.lo sgen-gc.lo gc.lo marshal.lo \
monitor.lo threads.lo threadpool.lo file-io.lo socket-io.lo \
---- mono-1.1.18/mono/metadata/loader.c 2006-10-12 14:16:07.000000000 -0400
-+++ mono-1.1.18-new/mono/metadata/loader.c 2006-10-23 19:49:21.000000000
-0400
+--- mono-1.2/mono/metadata/loader.c 2006-11-02 13:09:50.000000000 -0500
++++ mono-1.2-new/mono/metadata/loader.c 2006-11-10 14:26:01.000000000
-0500
@@ -1010,6 +1010,39 @@
mono_loader_unlock ();
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
