Author: ranger
Date: Wed May 20 20:10:21 2009
New Revision: 1543
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1543&repname=user%3a+ranger>
Log:
mono updates for 10.4 and maybe x86_64
Modified:
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
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=1543&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/languages/mono.info (original)
+++ trunk/experimental/10.4/main/finkinfo/languages/mono.info Wed May 20
20:10:21 2009
@@ -29,7 +29,7 @@
system-java15-dev,
xmkmf
<<
-BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev, gc
+BuildConflicts: libicu28-dev, libicu30-dev, gc
Replaces: <<
%N-dev (<< %v-%r),
monodoc
@@ -39,7 +39,7 @@
Source-MD5: da2bf1c0aba2958d26c5e8a9a49fd9d1
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
PatchFile: %n.patch
-PatchFile-MD5: 4d06cb9eaa4471369700f785eb18facd
+PatchFile-MD5: b3da2ada874c0841432588c610ef5a02
SetCPPFLAGS: -I%p/include
SetLDFLAGS: -bind_at_load
@@ -53,8 +53,28 @@
#!/bin/sh -ex
ulimit -n unlimited || :
- export PATH="`pwd`/runtime/_tmpinst/bin/mono:$PATH"
- export lt_cv_sys_max_cmd_len=65536 PATH="%p/lib/xmkmf/bin:$PATH"
+
+ # %p/bin and %p/sbin have mono stuff that conflicts on upgrade
+ save_IFS=$IFS
+ IFS=:
+ for DIR in $PATH; do
+ IFS=$save_IFS
+ if [ "$DIR" != "%p/bin" ] && [ "$DIR" != "%p/sbin" ]; then
+ NEWPATH="$NEWPATH:$DIR"
+ fi
+ done
+ IFS=$save_IFS
+ export PATH="%p/lib/xmkmf/bin$NEWPATH"
+ export lt_cv_sys_max_cmd_len=65536 lt_cv_apple_cc_single_mod=yes
+
+ # configure stuff to work around %p/bin being gone
+ export HAVE_MSGFMT="yes"
+ export MSGFMT="%p/bin/msgfmt"
+ export MSGMERGE="%p/bin/msgmerge"
+ export PKG_CONFIG="%p/bin/pkg-config"
+ export XGETTEXT="%p/bin/xgettext"
+ export XMKMF="%p/lib/xmkmf/bin/xmkmf"
+
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
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=1543&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/languages/mono.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/languages/mono.patch Wed May 20
20:10:21 2009
@@ -1,7 +1,7 @@
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-04-07 11:23:27.000000000 -0400
-@@ -3029,7 +3029,7 @@
++++ mono-2.4-new/configure 2009-05-20 12:41:10.000000000 -0400
+@@ -3029,11 +3029,11 @@
*-*-darwin*)
platform_win32=no
platform_darwin=yes
@@ -9,8 +9,35 @@
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_MACOSX_THREADS
-DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess
-DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
libmono_cflags="-D_THREAD_SAFE"
- LDFLAGS="$LDFLAGS -pthread"
-@@ -40039,11 +40039,11 @@
+- LDFLAGS="$LDFLAGS -pthread"
+- libmono_ldflags="-pthread"
++ LDFLAGS="$LDFLAGS"
++ libmono_ldflags=""
+ need_link_unlink=yes
+ cat >>confdefs.h <<\_ACEOF
+ #define PTHREAD_POINTER_ID 1
+@@ -22546,20 +22546,12 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <zlib.h>
+-int
+-main ()
+-{
+-
+ void main () {
+ #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
+ }
+ #else
+ #error No good zlib found
+ #endif
+-
+- ;
+- return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -40039,11 +40031,11 @@
case "$host" in
*-*-darwin*)
libsuffix=".dylib"
@@ -29,7 +56,7 @@
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-04-07 11:23:27.000000000 -0400
++++ mono-2.4-new/data/config.in 2009-05-20 12:26:06.000000000 -0400
@@ -5,18 +5,18 @@
<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@"
os="solaris"/>
<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@"
os="solaris"/>
@@ -58,7 +85,7 @@
<dllentry dll="__Internal" name="FillMemory"
target="mono_win32_compat_FillMemory"/>
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-04-07 11:23:27.000000000
-0400
++++ mono-2.4-new/mono/metadata/loader.c 2009-05-20 12:26:06.000000000
-0400
@@ -1196,6 +1196,24 @@
if (!module) {
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=1543&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/mono.info (original)
+++ trunk/experimental/common/main/finkinfo/languages/mono.info Wed May 20
20:10:21 2009
@@ -5,7 +5,7 @@
Source: http://ftp.novell.com/pub/mono/sources/%n/%n-%v.tar.bz2
Source-MD5: da2bf1c0aba2958d26c5e8a9a49fd9d1
PatchFile: %n.patch
-PatchFile-MD5: 4d06cb9eaa4471369700f785eb18facd
+PatchFile-MD5: b3da2ada874c0841432588c610ef5a02
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
Depends: <<
@@ -31,7 +31,7 @@
system-java15-dev,
xmkmf
<<
-BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev, gc
+BuildConflicts: libicu28-dev, libicu30-dev, gc
Replaces: %N-dev (<< %v-%r), monodoc
Type: java(1.5)
Homepage: http://www.mono-project.com/
@@ -57,8 +57,28 @@
#!/bin/sh -ex
ulimit -n unlimited || :
- export PATH="`pwd`/runtime/_tmpinst/bin/mono:$PATH"
- export lt_cv_sys_max_cmd_len=65536 PATH="%p/lib/xmkmf/bin:$PATH"
+
+ # %p/bin and %p/sbin have mono stuff that conflicts on upgrade
+ save_IFS=$IFS
+ IFS=:
+ for DIR in $PATH; do
+ IFS=$save_IFS
+ if [ "$DIR" != "%p/bin" ] && [ "$DIR" != "%p/sbin" ]; then
+ NEWPATH="$NEWPATH:$DIR"
+ fi
+ done
+ IFS=$save_IFS
+ export PATH="%p/lib/xmkmf/bin$NEWPATH"
+ export lt_cv_sys_max_cmd_len=65536 lt_cv_apple_cc_single_mod=yes
+
+ # configure stuff to work around %p/bin being gone
+ export HAVE_MSGFMT="yes"
+ export MSGFMT="%p/bin/msgfmt"
+ export MSGMERGE="%p/bin/msgmerge"
+ export PKG_CONFIG="%p/bin/pkg-config"
+ export XGETTEXT="%p/bin/xgettext"
+ export XMKMF="%p/lib/xmkmf/bin/xmkmf"
+
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
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
