Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv9256

Modified Files:
        libtool2.info 
Log Message:
Fix libtool2 build regression

Index: libtool2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/libtool2.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libtool2.info       10 Jul 2012 11:32:20 -0000      1.8
+++ libtool2.info       12 Jul 2012 23:15:49 -0000      1.9
@@ -16,7 +16,7 @@
 
 Package: libtool2
 Version: 2.4.2
-Revision: 2
+Revision: 3
 Maintainer: Max Horn <m...@quendi.de>
 Depends: %N-shlibs (= %v-%r)
 BuildDependsOnly: true
@@ -28,15 +28,24 @@
 PatchScript: <<
   #!/bin/sh -ev
   # Fix libtool.m4 autoconf tests to not get confused by conftest.dSYM dirs
-  /usr/bin/sed -i.orig -e 's|rm -f conftest\*|rm -rf conftest\*|g' 
libltdl/m4/libtool.m4
-  /usr/bin/sed -i.orig -e 's|\$RM conftest\*|\$RM -r conftest\*|g' 
libltdl/m4/libtool.m4
+  for f in libltdl/m4/libtool.m4 libltdl/configure configure ; do
+    /usr/bin/sed -i.orig -e 's|rm -f conftest\*|rm -rf conftest\*|g' \
+                         -e 's|\$RM conftest\*|\$RM -r conftest\*|g' $f
+  done
+  # Avoid unnecessary re-configure run
+  touch aclocal.m4 Makefile.in config-h.in
 <<
-ConfigureParams: --program-prefix=g --infodir=%p/share/info 
--disable-dependency-tracking
-CompileScript: <<
-# https://trac.macports.org/ticket/32321 -- configure test gcj -fno-common 
hangs
-F77=no FC=no GCJ=no SED=/usr/bin/sed ./configure %c
-make
+ConfigureParams: <<
+  --program-prefix=g \
+  --infodir=%p/share/info \
+  --disable-dependency-tracking \
+  F77=no \
+  FC=no \
+  GCJ=no \
+  SED=/usr/bin/sed
 <<
+# We disable gcj support explicitly, to avoid a hang. See:
+# https://trac.macports.org/ticket/32321 -- configure test gcj -fno-common 
hangs
 InfoTest: << 
 # Not all tests pass with latest gcc.
 # http://article.gmane.org/gmane.comp.gnu.libtool.bugs/7342


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to