[90077] trunk/dports/archivers/libzzip

21 Feb 2012

Revision: 90077
          http://trac.macports.org/changeset/90077
Author:   ryandesign@macports.org
Date:     2012-02-20 21:21:42 -0800 (Mon, 20 Feb 2012)
Log Message:
-----------
libzzip: fix universal variant when using clang; see #33315

Modified Paths:
--------------
    trunk/dports/archivers/libzzip/Portfile
    trunk/dports/archivers/libzzip/files/patch-configure.ac.diff

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

Modified: trunk/dports/archivers/libzzip/Portfile
===================================================================

--- trunk/dports/archivers/libzzip/Portfile	2012-02-21 05:16:22 UTC (rev 90076)
+++ trunk/dports/archivers/libzzip/Portfile	2012-02-21 05:21:42 UTC (rev 90077)
@@ -41,13 +41,10 @@
 if {[variant_isset universal]} {
     patchfiles-append patch-configure.ac.diff
     use_autoconf yes
+} else {
+    patchfiles-append patch-configure.diff
 }
 
-post-patch {
-    reinplace {/ZZIPLIB_LDFLAGS=/s/--export-dynamic/-export-dynamic/} \
-        ${worksrcpath}/configure
-}
-
 configure.env   PYTHON=/usr/bin/python
 
 post-configure {

Modified: trunk/dports/archivers/libzzip/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/archivers/libzzip/files/patch-configure.ac.diff	2012-02-21 05:16:22 UTC (rev 90076)
+++ trunk/dports/archivers/libzzip/files/patch-configure.ac.diff	2012-02-21 05:21:42 UTC (rev 90077)
@@ -1,5 +1,5 @@
---- configure.ac.orig	2010-03-29 14:24:17.000000000 -0500
-+++ configure.ac	2010-03-29 15:31:04.000000000 -0500
+--- configure.ac.orig	2010-05-08 08:36:29.000000000 -0500
++++ configure.ac	2012-02-20 23:14:21.000000000 -0600
 @@ -110,7 +110,6 @@
  AC_CHECK_TYPE(__int64,long long)
  AC_COMPILE_CHECK_SIZEOF(short)
@@ -8,3 +8,12 @@
  AC_C_BIGENDIAN
  AX_CHECK_ALIGNED_ACCESS_REQUIRED
  dnl -------------------------------------------------------------
+@@ -292,7 +291,7 @@
+ # ---------------------------------------------------------------
+ AC_MSG_CHECKING([link options])
+ ZZIPLIB_LDFLAGS=""
+-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
++test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic"
+ RESOLVES=" # "
+ case "$host_os" in mingw*)
+     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"

Added: trunk/dports/archivers/libzzip/files/patch-configure.diff
===================================================================
--- trunk/dports/archivers/libzzip/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/archivers/libzzip/files/patch-configure.diff	2012-02-21 05:21:42 UTC (rev 90077)
@@ -0,0 +1,11 @@
+--- configure.orig	2010-12-29 10:07:16.000000000 -0600
++++ configure	2012-02-20 23:13:41.000000000 -0600
+@@ -13713,7 +13713,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5
+ $as_echo_n "checking link options... " >&6; }
+ ZZIPLIB_LDFLAGS=""
+-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
++test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic"
+ RESOLVES=" # "
+ case "$host_os" in mingw*)
+     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"

    

ryandesign＠macports.org

tags

participants (1)