Author: ranger
Date: Wed Jan 10 22:45:29 2007
New Revision: 575
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=575&repname=user%3a+ranger>
Log:
experimenting with bind_at_load
Modified:
trunk/experimental/10.3/main/finkinfo/languages/mono.info
trunk/experimental/10.3/main/finkinfo/languages/mono.patch
trunk/experimental/10.4/main/finkinfo/languages/mono.info
trunk/experimental/10.4/main/finkinfo/languages/mono.patch
trunk/experimental/common/main/finkinfo/languages/mono.info
trunk/experimental/common/main/finkinfo/languages/mono.patch
Modified: trunk/experimental/10.3/main/finkinfo/languages/mono.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/languages/mono.info&rev=575&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/languages/mono.info (original)
+++ trunk/experimental/10.3/main/finkinfo/languages/mono.info Wed Jan 10
22:45:29 2007
@@ -1,13 +1,32 @@
Package: mono
Version: 1.2.2.1
-Revision: 11
+Revision: 12
Description: .NET-compatible CIL engine
Type: java(1.4)
License: LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: cairo-shlibs (>= 1.2.2-1), glib2-shlibs (>= 2.8.6-1),
libgettext3-shlibs, system-java14, macosx (>= 10.3.9-1)
-BuildDepends: cairo (>= 1.0.0-1), fink (>= 0.24-1), libgettext3-dev,
gettext-tools, glib2-dev (>= 2.8.6-1), glib2 (>= 2.8.6-1), glitz (>= 0.4.4-1),
libiconv-dev, libicu31-dev, libpixman1 (>= 0.1.5-1), pkgconfig,
system-java14-dev
+Depends: <<
+ cairo-shlibs (>= 1.2.2-1),
+ glib2-shlibs (>= 2.8.6-1),
+ libgettext3-shlibs,
+ system-java14,
+ macosx (>= 10.3.9-1)
+<<
+BuildDepends: <<
+ cairo (>= 1.0.0-1),
+ fink (>= 0.24-1),
+ libgettext3-dev,
+ gettext-tools,
+ glib2-dev (>= 2.8.6-1),
+ glib2 (>= 2.8.6-1),
+ glitz (>= 0.4.4-1),
+ libiconv-dev,
+ libicu31-dev,
+ libpixman1 (>= 0.1.5-1),
+ pkgconfig,
+ system-java14-dev
+<<
BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev
CustomMirror: RangerMirror
@@ -16,6 +35,7 @@
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
SetCPPFLAGS: -I%p/include
+SetLDFLAGS: -bind_at_load
SetLIBS: -L%p/lib
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
Modified: trunk/experimental/10.3/main/finkinfo/languages/mono.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/languages/mono.patch&rev=575&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/languages/mono.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/languages/mono.patch Wed Jan 10
22:45:29 2007
@@ -45,81 +45,6 @@
+ <dllmap dll="libX11" target="/usr/X11R6/lib/@X11@" />
+ <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@" />
</configuration>
---- 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 @@
Modified: trunk/experimental/10.4/main/finkinfo/languages/mono.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/languages/mono.info&rev=575&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/languages/mono.info (original)
+++ trunk/experimental/10.4/main/finkinfo/languages/mono.info Wed Jan 10
22:45:29 2007
@@ -1,13 +1,32 @@
Package: mono
Version: 1.2.2.1
-Revision: 1021
+Revision: 1022
Description: .NET-compatible CIL engine
Type: java(1.4)
License: LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: cairo-shlibs (>= 1.2.2-1001), glib2-shlibs (>= 2.8.6-123),
libgettext3-shlibs, system-java14, macosx (>= 10.4.3-1)
-BuildDepends: cairo (>= 1.0.0-1), fink (>= 0.24-1), libgettext3-dev,
gettext-tools, glib2-dev (>= 2.8.6-123), glib2 (>= 2.8.6-123), glitz (>=
0.4.4-1), libiconv-dev, libicu32-dev, libpixman1 (>= 0.1.5-1), pkgconfig,
system-java14-dev
+Depends: <<
+ cairo-shlibs (>= 1.2.2-1001),
+ glib2-shlibs (>= 2.12.0-1),
+ libgettext3-shlibs,
+ system-java14,
+ macosx (>= 10.4.3-1)
+<<
+BuildDepends: <<
+ cairo (>= 1.0.0-1),
+ fink (>= 0.24-1),
+ libgettext3-dev,
+ gettext-tools,
+ glib2-dev (>= 2.12.0-1),
+ glib2 (>= 2.12.0-1),
+ glitz (>= 0.4.4-1),
+ libiconv-dev,
+ libicu32-dev,
+ libpixman1 (>= 0.1.5-1),
+ pkgconfig (>= 0.21-1),
+ system-java14-dev
+<<
BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev
CustomMirror: RangerMirror
@@ -16,6 +35,7 @@
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
SetCPPFLAGS: -I%p/include
+SetLDFLAGS: -bind_at_load
SetLIBS: -L%p/lib
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
Modified: trunk/experimental/10.4/main/finkinfo/languages/mono.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/languages/mono.patch&rev=575&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/languages/mono.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/languages/mono.patch Wed Jan 10
22:45:29 2007
@@ -45,81 +45,6 @@
+ <dllmap dll="libX11" target="/usr/X11R6/lib/@X11@" />
+ <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@" />
</configuration>
---- 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 @@
Modified: trunk/experimental/common/main/finkinfo/languages/mono.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/languages/mono.info&rev=575&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/mono.info (original)
+++ trunk/experimental/common/main/finkinfo/languages/mono.info Wed Jan 10
22:45:29 2007
@@ -1,6 +1,6 @@
Package: mono
Version: 1.2.2.1
-Revision: 1
+Revision: 2
CustomMirror: RangerMirror
Source: http://go-mono.com/sources/%n/%n-%v.tar.gz
@@ -36,7 +36,8 @@
Description: .NET-compatible CIL engine
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/include
-NoSETLDFLAGS: true
+NoSetLDFLAGS: true
+SetLDFLAGS: -bind_at_load
SetLIBS: -L%p/lib
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
Modified: trunk/experimental/common/main/finkinfo/languages/mono.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/languages/mono.patch&rev=575&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/mono.patch (original)
+++ trunk/experimental/common/main/finkinfo/languages/mono.patch Wed Jan 10
22:45:29 2007
@@ -46,84 +46,6 @@
+ <dllmap dll="libX11" target="/usr/X11R6/lib/@X11@" />
+ <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/[EMAIL
PROTECTED]@" />
</configuration>
-diff -uNr mono-1.2/libgc/darwin_stop_world.c
mono-1.2-new/libgc/darwin_stop_world.c
---- 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;
-
-diff -uNr mono-1.2/libgc/include/private/gc_priv.h
mono-1.2-new/libgc/include/private/gc_priv.h
---- 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 */
-diff -uNr mono-1.2/libgc/os_dep.c mono-1.2-new/libgc/os_dep.c
---- 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");
-
diff -uNr mono-1.2/mono/metadata/Makefile.in
mono-1.2-new/mono/metadata/Makefile.in
--- 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
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
