Reworking patches to avoid gnu-ld's --export-dynamic flag for environments

without gnu-ld

6 files changed, 38 insertions, 85 deletions

diff --git a/archivers/zziplib/distinfo b/archivers/zziplib/distinfo
index 28ad2508fdc..7ddc69e8bd4 100644
--- a/archivers/zziplib/distinfo
+++ b/archivers/zziplib/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.8 2009/11/22 20:35:25 sno Exp $
+$NetBSD: distinfo,v 1.9 2009/11/29 20:40:08 sno Exp $
 
 SHA1 (zziplib-0.13.56.tar.bz2) = aa8cebc8c5e815a1071b17c6878876adedc4a333
 RMD160 (zziplib-0.13.56.tar.bz2) = c217cff4c4b1ec6bc868a0d89a55c75b8ea46fa9
 Size (zziplib-0.13.56.tar.bz2) = 696931 bytes
 SHA1 (patch-aa) = 6bfead43e5dae726861a8d1c21ed829126e64b41
-SHA1 (patch-ba) = 8b62c70f25a3fa82c611c1c6ad39b9c9bd66878d
-SHA1 (patch-bb) = d9c2091ef8d6a7ee989d2f521f61e6fadc4c3539
-SHA1 (patch-bc) = 7fb2160539fe8ae9ece7c8acc5747b34c82e2791
-SHA1 (patch-bd) = f9bacfd878ff3ed86a03dd3b9d52fd0cca03a2bf
-SHA1 (patch-be) = ae2b2190e9d10828094e36666445a91833b7a3ef
+SHA1 (patch-ba) = 9203c92f8dd76bb2e21e512c7811fb0bd852cbee
+SHA1 (patch-bb) = e2f03667b73ce445d5a96262898dddfe324e0764
+SHA1 (patch-bc) = d5300d81155c11358625ff320cb6055dcc8ed860
diff --git a/archivers/zziplib/patches/patch-ba b/archivers/zziplib/patches/patch-ba
index 84a8362e177..7680bad4035 100644
--- a/archivers/zziplib/patches/patch-ba
+++ b/archivers/zziplib/patches/patch-ba
@@ -1,24 +1,16 @@
-$NetBSD: patch-ba,v 1.1 2009/11/22 20:35:25 sno Exp $
+$NetBSD: patch-ba,v 1.2 2009/11/29 20:40:08 sno Exp $
 
 replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
+for non-gnu-ld
 
---- configure.orig	2009-05-30 17:09:35.000000000 +0200
-+++ configure	2009-05-30 17:12:17.000000000 +0200
-@@ -5501,7 +5501,7 @@
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    export_dynamic_flag_spec='${EXPORT_SYMBOLS_LDFLAGS}'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
-       # dlltool doesn't understand --whole-archive et. al.
-@@ -9601,7 +9601,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+--- configure.orig	2009-06-27 18:32:33.000000000 +0000
++++ configure	2009-11-29 20:29:57.000000000 +0000
+@@ -16179,7 +16179,7 @@
+ 
+     if ".$can_build_shared" = .no
+     then ZZIPLIB_LDFLAGS=""
+-    else ZZIPLIB_LDFLAGS="--export-dynamic"
++    else ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+     fi
      RESOLVES=' # '
    ;;
- esac
diff --git a/archivers/zziplib/patches/patch-bb b/archivers/zziplib/patches/patch-bb
index 809fff613b8..b3d1fa07d0a 100644
--- a/archivers/zziplib/patches/patch-bb
+++ b/archivers/zziplib/patches/patch-bb
@@ -1,15 +1,16 @@
-$NetBSD: patch-bb,v 1.1 2009/11/22 20:35:25 sno Exp $
+$NetBSD: patch-bb,v 1.2 2009/11/29 20:40:08 sno Exp $
 
 replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
+for non-gnu-ld
 
---- configure.ac.orig	2009-05-30 17:09:44.000000000 +0200
-+++ configure.ac	2009-05-30 17:12:40.000000000 +0200
+--- configure.ac.orig	2009-06-27 18:28:16.000000000 +0000
++++ configure.ac	2009-11-29 20:30:35.000000000 +0000
 @@ -288,7 +288,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+ 
+     if ".$can_build_shared" = .no
+     then ZZIPLIB_LDFLAGS=""
+-    else ZZIPLIB_LDFLAGS="--export-dynamic"
++    else ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+     fi
      RESOLVES=' # '
    ;;
- esac
diff --git a/archivers/zziplib/patches/patch-bc b/archivers/zziplib/patches/patch-bc
index ee70827a7e4..62186fde378 100644
--- a/archivers/zziplib/patches/patch-bc
+++ b/archivers/zziplib/patches/patch-bc
@@ -1,15 +1,16 @@
-$NetBSD: patch-bc,v 1.1 2009/11/22 20:35:25 sno Exp $
+$NetBSD: patch-bc,v 1.2 2009/11/29 20:40:08 sno Exp $
 
 replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
+for xlc
 
---- aclocal.m4.orig	2009-05-30 17:09:55.000000000 +0200
-+++ aclocal.m4	2009-05-30 17:13:08.000000000 +0200
-@@ -3856,7 +3856,7 @@
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    export_dynamic_flag_spec='${EXPORT_SYMBOLS_LDFLAGS}'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
-       # dlltool doesn't understand --whole-archive et. al.
+--- m4/libtool.m4.orig	2009-11-29 20:26:36.000000000 +0000
++++ m4/libtool.m4	2009-11-29 20:29:09.000000000 +0000
+@@ -5947,7 +5947,7 @@
+ 	  xl*)
+ 	    # IBM XL 8.0 on PPC, with GNU ld
+ 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${EXPORT_SYMBOLS_LDFLAGS}'
+ 	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	    if test "x$supports_anon_versioning" = xyes; then
+ 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
diff --git a/archivers/zziplib/patches/patch-bd b/archivers/zziplib/patches/patch-bd
deleted file mode 100644
index d91b6624de5..00000000000
--- a/archivers/zziplib/patches/patch-bd
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2009/11/22 20:35:25 sno Exp $
-
-replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
-
---- zziplib/configure.orig	2009-05-30 17:10:08.000000000 +0200
-+++ zziplib/configure	2009-05-30 17:13:49.000000000 +0200
-@@ -5017,7 +5017,7 @@
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    export_dynamic_flag_spec='${EXPORT_SYMBOLS_LDFLAGS}'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
-       # dlltool doesn't understand --whole-archive et. al.
-@@ -8553,7 +8553,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-     RESOLVES=' # '
-   ;;
- esac
diff --git a/archivers/zziplib/patches/patch-be b/archivers/zziplib/patches/patch-be
deleted file mode 100644
index 13b4a0bd7ca..00000000000
--- a/archivers/zziplib/patches/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-be,v 1.1 2009/11/22 20:35:25 sno Exp $
-
-replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
-
---- zziplib/configure.ac.orig	2009-05-30 17:10:18.000000000 +0200
-+++ zziplib/configure.ac	2009-05-30 17:14:09.000000000 +0200
-@@ -226,7 +226,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-     RESOLVES=' # '
-   ;;
- esac