pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/zsh Compare "MKDYNAMICROOT" with "no" to figure...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/afb991eab8c4
branches:  trunk
changeset: 532208:afb991eab8c4
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Aug 13 19:43:30 2007 +0000

description:
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:

 shells/zsh/Makefile.common |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r 8d4c43ffddcd -r afb991eab8c4 shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Mon Aug 13 19:15:37 2007 +0000
+++ b/shells/zsh/Makefile.common        Mon Aug 13 19:43:30 2007 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index