Author: ranger
Date: Wed May 20 22:35:16 2009
New Revision: 1544
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1544&repname=user%3a+ranger>
Log:
mono updates
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
trunk/experimental/common/main/finkinfo/languages/mono.patch
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=1544&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
22:35:16 2009
@@ -1,6 +1,8 @@
+Info4: <<
Package: mono
Version: 2.4
Revision: 1
+Architecture: i386, powerpc
Description: .NET-compatible CIL engine
Type: java(1.5)
License: LGPL
@@ -18,6 +20,7 @@
fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
+ # gc (>= 7.1-1),
gettext-tools,
glib2-dev (>= 2.14.0-1),
glitz (>= 0.4.4-1),
@@ -29,7 +32,7 @@
system-java15-dev,
xmkmf
<<
-BuildConflicts: libicu28-dev, libicu30-dev, gc
+BuildConflicts: libicu28-dev, libicu30-dev
Replaces: <<
%N-dev (<< %v-%r),
monodoc
@@ -39,7 +42,7 @@
Source-MD5: da2bf1c0aba2958d26c5e8a9a49fd9d1
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
PatchFile: %n.patch
-PatchFile-MD5: b3da2ada874c0841432588c610ef5a02
+PatchFile-MD5: 1630ab2a45eb226a7cf3556efcc0b738
SetCPPFLAGS: -I%p/include
SetLDFLAGS: -bind_at_load
@@ -48,7 +51,7 @@
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
-ConfigureParams: --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: --build=%m-apple-darwin`uname -r|cut -f1 -d.` --with-gc=boehm
--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"
CompileScript: <<
#!/bin/sh -ex
@@ -58,7 +61,6 @@
save_IFS=$IFS
IFS=:
for DIR in $PATH; do
- IFS=$save_IFS
if [ "$DIR" != "%p/bin" ] && [ "$DIR" != "%p/sbin" ]; then
NEWPATH="$NEWPATH:$DIR"
fi
@@ -66,6 +68,7 @@
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
+ export ac_cv_header_poll_h=no ac_cv_header_sys_poll_h=no
ac_cv_type_struct_pollfd=no
# configure stuff to work around %p/bin being gone
export HAVE_MSGFMT="yes"
@@ -74,6 +77,12 @@
export PKG_CONFIG="%p/bin/pkg-config"
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
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
@@ -94,6 +103,7 @@
Package: %N-shlibs
Depends: <<
cairo-shlibs (>= 1.8.6-1),
+ # gc-shlibs (>= 7.1-1),
glib2-shlibs (>= 2.14.0-1),
macosx (>= 10.4.3-1)
<<
@@ -147,4 +157,5 @@
new systems), the class loader, the garbage collector, threading
system and metadata access libraries.
<<
+<<
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=1544&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
22:35:16 2009
@@ -111,3 +111,38 @@
while ((full_name = mono_dl_build_path (".", 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-20 15:58:55.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-20 15:58:55.000000000
-0400
+@@ -213,7 +213,9 @@
+
+ #ifndef PLATFORM_WIN32
+
++#ifndef __APPLE__
+ #define MONO_ARCH_USE_SIGACTION 1
++#endif
+
+ #ifdef HAVE_WORKING_SIGALTSTACK
+
+@@ -319,7 +321,9 @@
+ #define MONO_ARCH_MONITOR_OBJECT_REG AMD64_RDI
+ #endif
+
++#if !defined(__APPLE__)
+ #define MONO_ARCH_AOT_SUPPORTED 1
++#endif
+
+ #if !defined(PLATFORM_WIN32) || defined(__sun)
+ #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1
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=1544&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/mono.info (original)
+++ trunk/experimental/common/main/finkinfo/languages/mono.info Wed May 20
22:35:16 2009
@@ -1,17 +1,19 @@
+Info4: <<
Package: mono
Version: 2.4
Revision: 1
+Architecture: i386, powerpc
Source: http://ftp.novell.com/pub/mono/sources/%n/%n-%v.tar.bz2
Source-MD5: da2bf1c0aba2958d26c5e8a9a49fd9d1
PatchFile: %n.patch
-PatchFile-MD5: b3da2ada874c0841432588c610ef5a02
+PatchFile-MD5: 1630ab2a45eb226a7cf3556efcc0b738
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
Depends: <<
%N-shlibs (= %v-%r),
libgettext3-shlibs,
- system-java15
+ system-java15,
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
@@ -20,6 +22,7 @@
fink (>= 0.28-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
+# gc (>= 7.1-1),
gettext-tools,
glib2-dev (>= 2.14.0-1),
glitz (>= 0.4.4-1),
@@ -29,9 +32,9 @@
pixman (>= 0.12.0-1),
pkgconfig (>= 0.22-3),
system-java15-dev,
- xmkmf
+ xmkmf,
<<
-BuildConflicts: libicu28-dev, libicu30-dev, gc
+BuildConflicts: libicu28-dev, libicu30-dev
Replaces: %N-dev (<< %v-%r), monodoc
Type: java(1.5)
Homepage: http://www.mono-project.com/
@@ -44,7 +47,7 @@
SetLIBS: -L%p/lib
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-ConfigureParams: --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: --build=%m-apple-darwin`uname -r|cut -f1 -d.` --with-gc=boehm
--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"
ConfFiles: <<
%p/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
%p/etc/mono/1.0/machine.config
@@ -62,7 +65,6 @@
save_IFS=$IFS
IFS=:
for DIR in $PATH; do
- IFS=$save_IFS
if [ "$DIR" != "%p/bin" ] && [ "$DIR" != "%p/sbin" ]; then
NEWPATH="$NEWPATH:$DIR"
fi
@@ -70,6 +72,7 @@
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
+ export ac_cv_header_poll_h=no ac_cv_header_sys_poll_h=no
ac_cv_type_struct_pollfd=no
# configure stuff to work around %p/bin being gone
export HAVE_MSGFMT="yes"
@@ -78,6 +81,12 @@
export PKG_CONFIG="%p/bin/pkg-config"
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
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
@@ -102,8 +111,9 @@
Replaces: %N (<< %v-%r)
Depends: <<
cairo-shlibs (>= 1.8-1),
+# gc-shlibs (>= 7.1-1),
glib2-shlibs (>= 2.14.0-1),
- macosx (>= 10.4.3-1)
+ macosx (>= 10.4.3-1),
<<
Files: <<
lib/libmono-profiler-*.0*.dylib
@@ -138,3 +148,4 @@
system and metadata access libraries.
<<
License: LGPL
+<<
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=1544&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/mono.patch (original)
+++ trunk/experimental/common/main/finkinfo/languages/mono.patch Wed May 20
22:35:16 2009
@@ -111,3 +111,38 @@
while ((full_name = mono_dl_build_path (".", 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-20 15:58:55.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-20 15:58:55.000000000
-0400
+@@ -213,7 +213,9 @@
+
+ #ifndef PLATFORM_WIN32
+
++#ifndef __APPLE__
+ #define MONO_ARCH_USE_SIGACTION 1
++#endif
+
+ #ifdef HAVE_WORKING_SIGALTSTACK
+
+@@ -319,7 +321,9 @@
+ #define MONO_ARCH_MONITOR_OBJECT_REG AMD64_RDI
+ #endif
+
++#if !defined(__APPLE__)
+ #define MONO_ARCH_AOT_SUPPORTED 1
++#endif
+
+ #if !defined(PLATFORM_WIN32) || defined(__sun)
+ #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1
------------------------------------------------------------------------------
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
