Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv30155

Modified Files:
        guile20.info 
Log Message:
fix for latest gc, use system-libffi


Index: guile20.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/guile20.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guile20.info        25 Jan 2012 01:02:02 -0000      1.1
+++ guile20.info        25 Jan 2012 01:02:53 -0000      1.2
@@ -1,9 +1,8 @@
 Package: guile20
 Version: 2.0.3
-Revision: 1
+Revision: 2
 BuildDepends: <<
   readline5 (>= 5.0-1004),
-  libffi,
   libncurses5 (>= 5.4-20041023-1006),
   libtool2,
   libunistring0, 
@@ -18,11 +17,12 @@
 Depends: <<
   %N-shlibs (= %v-%r),
   %N-libs (= %v-%r),
-  libffi-shlibs,
   libtool2-shlibs
 <<
 # prevent from building against old installed library
 # BuildConflicts: guile20-dev
+# this package is busted on many platforms
+BuildConflicts: libffi
 GCC: 4.0
 Source: mirror:gnu:guile/guile-%v.tar.gz
 Source-MD5: 3b8b4e1083037f29d2c4704a6d55f2a8
@@ -51,12 +51,21 @@
 echo 'eval "$@"'
 } > guile20-build
 chmod +x guile20-build
+
+# Fix for newer gc stricter #include semantics. See:
+# 
http://patch-tracker.debian.org/patch/series/view/guile-2.0/2.0.3+1-2/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
+perl -pi -e 's,c/gc_version.h,c/gc.h,' 
test-suite/standalone/test-pthread-create-secondary.c
+
+# Don't try to use libffi APIs not present system-ffi (old version)
+# (not sure why this isn't a configure test)
+perl -pi -e 
's/FFI_CLOSURES/FFI_CLOSURES_ONLY_AVAILABLE_IN_NEW_LIBFFI_THAT_IS_BROKEN_ON_DARWIN/g'
 libguile/foreign.c
 <<
 # gl_cv_func_svid_putenv=yes
 ConfigureParams: <<
        --infodir=%p/share/info \
        --program-transform-name="s|guile|guile-2.0|g" \
        $threads \
+       LIBFFI_CFLAGS="-I/usr/include/ffi" LIBFFI_LIBS="-lffi" \
        -C
 <<
 NoSetCPPFLAGS: true


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to