[53368] trunk/dports/archivers/zlib

[blb at macports.org]

Revision: 53368
          http://trac.macports.org/changeset/53368
Author:   blb at macports.org
Date:     2009-07-03 23:27:18 -0700 (Fri, 03 Jul 2009)
Log Message:
-----------
archivers/zlib - make sure dylib can be built when the arch does not include the "native" one (eg, x86_64 on 10.5 using the build_arch option or universal_archs with +universal)

Modified Paths:
--------------
    trunk/dports/archivers/zlib/Portfile

Added Paths:
-----------
    trunk/dports/archivers/zlib/files/patch-configure.diff

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2009-07-04 04:52:59 UTC (rev 53367)
+++ trunk/dports/archivers/zlib/Portfile	2009-07-04 06:27:18 UTC (rev 53368)
@@ -25,7 +25,8 @@
                         sha1    967e280f284d02284b0cd8872a8e2e04bfdc7283 \
                         rmd160  cfba9984b354dcc38da49331457e6bfc861c6f51
 
-patchfiles              patch-Makefile-static.diff patch-Makefile-test.diff
+patchfiles              patch-Makefile-static.diff patch-Makefile-test.diff \
+                        patch-configure.diff
 
 configure.args          --shared
 configure.universal_args

Added: trunk/dports/archivers/zlib/files/patch-configure.diff
===================================================================
--- trunk/dports/archivers/zlib/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/archivers/zlib/files/patch-configure.diff	2009-07-04 06:27:18 UTC (rev 53368)
@@ -0,0 +1,19 @@
+--- configure.orig	2005-07-11 14:11:57.000000000 -0600
++++ configure	2009-07-03 21:59:59.000000000 -0600
+@@ -18,6 +18,7 @@
+ # If you have problems, try without defining CC and CFLAGS before reporting
+ # an error.
+ 
++old_ldflags="$LDFLAGS"
+ LIBS=libz.a
+ LDFLAGS="-L. ${LIBS}"
+ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+@@ -96,7 +97,7 @@
+              SHAREDLIB=libz$shared_ext
+              SHAREDLIBV=libz.$VER$shared_ext
+              SHAREDLIBM=libz.$VER1$shared_ext
+-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
++             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER $old_ldflags"};;
+   *)             LDSHARED=${LDSHARED-"$cc -shared"};;
+   esac
+ else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090703/eb1bd6ad/attachment.html>