[pkgsrc/trunk]: pkgsrc/shells/zsh Set "BUILDLINK_PASSTHRU_RPATHDIRS" to stop ...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a79132a46db
branches:  trunk
changeset: 479686:7a79132a46db
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Aug 20 16:59:58 2004 +0000

description:
Set "BUILDLINK_PASSTHRU_RPATHDIRS" to stop buildlink3 from removing "/lib"
from the run time shared library path instead of trying to defeat its
option parser.

diffstat:

 shells/zsh/Makefile.common |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r bca6779e4468 -r 7a79132a46db shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Fri Aug 20 14:22:16 2004 +0000
+++ b/shells/zsh/Makefile.common        Fri Aug 20 16:59:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/08/20 11:48:46 tron Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/08/20 16:59:58 tron Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=    shells
@@ -28,13 +28,14 @@
 BUILD_DEFS+=   ZSH_STATIC
 
 .if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=--disable-dynamic
+CONFIGURE_ARGS+=       --disable-dynamic
 
 NETBSD_SHLINKER=       /libexec/ld.elf_so
+NETBSD_SHLIBDIR=       /lib
 
-.  if ${OPSYS} == "NetBSD" && \
+.  if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" && \
       defined(MKDYNAMICROOT) && !empty(MKDYNAMICROOT:M[Yy][Ee][Ss]) && \
-      ${OBJECT_FMT} == "ELF" && exists(${NETBSD_SHLINKER})
+      exists(${NETBSD_SHLINKER}) && exists(${NETBSD_SHLIBDIR})
 #
 # Built a dynamically linked "zsh" binary on NetBSD systems which use
 # dynamically linked binaries on the root filesystem. The binary will
@@ -42,7 +43,9 @@
 # root filesystem. We use "-rpath" below by purpose because the
 # buildlink 3 framework won't filter it out.
 #
-LDFLAGS+=      -Wl,-dynamic-linker=${NETBSD_SHLINKER} -rpath=/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${NETBSD_SHLIBDIR}
+
+LDFLAGS+=      -Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR}
 .  else
 LDFLAGS+=      -static
 .  endif