diff options
| author | joerg <joerg@pkgsrc.org> | 2011-11-11 18:45:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-11-11 18:45:46 +0000 |
| commit | 42e00e7e50a752d0f574ed4cee4b5611b2994cd9 (patch) | |
| tree | afdcb2841535e3d59ee4e2a3bbf5ee880e0b7389 /shells/zsh | |
| parent | c80143f9cb38d99ec2fe67ff06f79945f73f20cf (diff) | |
| download | pkgsrc-42e00e7e50a752d0f574ed4cee4b5611b2994cd9.tar.gz | |
Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
clang, which doesn't have a reason to disable it again.
Diffstat (limited to 'shells/zsh')
| -rw-r--r-- | shells/zsh/distinfo | 4 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ac | 13 |
2 files changed, 10 insertions, 7 deletions
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}" ;; |