Don't force -Wl,--whole-archive for NetBSD, it breaks the build with

clang, which doesn't have a reason to disable it again.

4 files changed, 19 insertions, 13 deletions

diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo
index 53f975087c3..9941c2711b7 100644
--- a/shells/zsh-current/distinfo
+++ b/shells/zsh-current/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2011/07/30 11:53:52 ryoon Exp $
+$NetBSD: distinfo,v 1.21 2011/11/11 18:45:46 joerg Exp $
 
 SHA1 (zsh-4.3.12.tar.bz2) = 8fd7a6d841770c8b12cf3ae8229dd857ecdbad93
 RMD160 (zsh-4.3.12.tar.bz2) = 83f2a0f3e590722262e5725df97d924b1fd4ee84
 Size (zsh-4.3.12.tar.bz2) = 2917959 bytes
 SHA1 (patch-ab) = 577a98385f258cbc47ff49d0b4bc6cc9134e864a
-SHA1 (patch-ac) = 8cc69ee851f76b82387e0cc4e447877b41f7cee5
+SHA1 (patch-ac) = 23c086e61120f9c533e4a3a53e44c5b6b48b1352
 SHA1 (patch-af) = cedd6fb7369b0fc9debbaab29aaf40c25c587123
 SHA1 (patch-ag) = e18e26bae0996d42fa9f98730a8fb844ce4b7a44
diff --git a/shells/zsh-current/patches/patch-ac b/shells/zsh-current/patches/patch-ac
index 76059cddc5e..7cdbe793a8d 100644
--- a/shells/zsh-current/patches/patch-ac
+++ b/shells/zsh-current/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2011/07/30 11:53:52 ryoon Exp $
+$NetBSD: patch-ac,v 1.7 2011/11/11 18:45:46 joerg Exp $
 
 --- configure.orig	2011-05-16 15:49:15.000000000 +0000
 +++ configure
@@ -21,12 +21,15 @@ $NetBSD: patch-ac,v 1.6 2011/07/30 11:53:52 ryoon Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -11467,7 +11472,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
+@@ -11467,10 +11472,9 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
    fi
    case "$host_os" in
      osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;;
 -    *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-+    *freebsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
++    *freebsd*|*netbsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
      sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
      sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
-     netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
+-    netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
+     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
+     solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
+     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index d4362c82aaa..246783b90b2 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.32 2010/11/27 07:21:27 obache Exp $
+$NetBSD: distinfo,v 1.33 2011/11/11 18:45:46 joerg Exp $
 
 SHA1 (zsh-4.2.7.tar.bz2) = 64c598cd48b78dff9d29341ea0cd904e7aa49541
 RMD160 (zsh-4.2.7.tar.bz2) = 454339205c78393cbb9460aa10f37fa341a40b59
 Size (zsh-4.2.7.tar.bz2) = 2303693 bytes
 SHA1 (patch-ab) = b446fd8138f18113c17cee43cd11a5f458b1db40
-SHA1 (patch-ac) = c80876a222ff9584bc53ec807ee2a8bc2b003cd1
+SHA1 (patch-ac) = 816e41ff44a643fe53f73c63cb35b0cf363430e7
 SHA1 (patch-ae) = ac77147eebfebcd042f93a71bb13f9c0be8de211
 SHA1 (patch-ba) = 6cfee12c6fc4ddb07709e07f4f39e3b1ad6c9f16
 SHA1 (patch-bb) = ed3fb8a9e439ea5de6db81bdf9b8c59eb95070e0
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 0b791252172..6876c572dbc 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.21 2008/12/21 16:53:31 uebayasi Exp $
+$NetBSD: patch-ac,v 1.22 2011/11/11 18:45:46 joerg Exp $
 
---- configure.orig	2007-11-29 19:17:19.000000000 +0900
+--- configure.orig	2007-11-29 10:17:19.000000000 +0000
 +++ configure
 @@ -16619,6 +16619,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
          DLLD="${DLLD=$CC}"
@@ -21,12 +21,15 @@ $NetBSD: patch-ac,v 1.21 2008/12/21 16:53:31 uebayasi Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -16642,7 +16647,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+@@ -16642,10 +16647,9 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
      esac
    fi
    case "$host_os" in
 -    *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-+    *freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
++    *freebsd*|*netbsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
      sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
      sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
-     netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
+-    netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
+     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
+     solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
+     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;