diff options
| author | tron <tron> | 2007-08-13 19:43:30 +0000 |
|---|---|---|
| committer | tron <tron> | 2007-08-13 19:43:30 +0000 |
| commit | 867db9cd9e81ff658b30b0fb04e958bb77046a7b (patch) | |
| tree | 55adbe26729014b145b8584a9659d5f442d84dfa /shells | |
| parent | d0d4333f8fb29ad255a7b05a8ba6fecadd253814 (diff) | |
| download | pkgsrc-867db9cd9e81ff658b30b0fb04e958bb77046a7b.tar.gz | |
Compare "MKDYNAMICROOT" with "no" to figure out the desirable static
linking behavior under NetBSD. This matches what "bsd.shlib.mk" does
and avoids "Malformed conditional" warnings under other platforms.
This fixes PR pkg/36769 by Yakovetsky Vladimir.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile.common | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index f5ad2d1edc9..4790e59fe37 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2007/08/07 18:54:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.41 2007/08/13 19:43:30 tron Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -38,9 +38,11 @@ CONFIGURE_ARGS+= --disable-dynamic NETBSD_SHLINKER= /libexec/ld.elf_so NETBSD_SHLIBDIR= /lib -. if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" && \ - defined(MKDYNAMICROOT) && !empty(MKDYNAMICROOT:M[Yy][Ee][Ss]) && \ - exists(${NETBSD_SHLINKER}) && exists(${NETBSD_SHLIBDIR}) +. if ${OPSYS} == "NetBSD" && \ + defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \ + defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \ + defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \ + defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR}) # # Built a dynamically linked "zsh" binary on NetBSD systems which use # dynamically linked binaries on the root filesystem. The binary will |