From 940c645dcd3299455f3d72d47b6cb8f735209676 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Fri, 20 Aug 2004 16:59:58 +0000
Subject: 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.

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

(limited to 'shells')

diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 4a7d30e6b81..8b2a389a920 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -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 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 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 @@ NETBSD_SHLINKER=	/libexec/ld.elf_so
 # 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
-- 
cgit v1.2.3