summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjschauma <jschauma>2002-12-03 16:16:37 +0000
committerjschauma <jschauma>2002-12-03 16:16:37 +0000
commitbb10d8072cb806ed237e462b31cb3a847ed4c6d2 (patch)
tree95e0a05c052a29caddf6552cad38f79ead0a6d6b /mk
parent714118aa2d34bcf7f4a7b8505fc61514dbb65419 (diff)
downloadpkgsrc-bb10d8072cb806ed237e462b31cb3a847ed4c6d2.tar.gz
Commit patch from Nick after testing it on IRIX.
This patch corrects a typo and uses PKGCONFIG_OVERRIDE_SED rather than adjusting sed lateron in the target. Modification of the patch: use '-Wl,-rpath,/path' rather than '-Wl,-rpath -Wl,/path' as suggested by jlam in another email.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk21
1 files changed, 12 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 34455894f37..0265f07d4ab 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1093 2002/12/02 17:07:27 jschauma Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1094 2002/12/03 16:16:37 jschauma Exp $
#
# This file is in the public domain.
#
@@ -357,7 +357,7 @@ M4?= /usr/bin/m4
X11_LDFLAGS= # empty
. if ${_USE_RPATH} == "yes"
. if ${OPSYS} == "IRIX"
-X11_LDFlAGS+= -Wl,-rpath -Wl,${X11BASE}/lib
+X11_LDFLAGS+= -Wl,-rpath,${X11BASE}/lib
. else
X11_LDFLAGS+= -Wl,-R${X11BASE}/lib
. endif
@@ -367,7 +367,7 @@ LDFLAGS+= ${X11_LDFLAGS}
.endif
.if ${_USE_RPATH} == "yes"
. if ${OPSYS} == "IRIX"
-LDFLAGS+= -Wl,-rpath -Wl,${LOCALBASE}/lib
+LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib
. else
LDFLAGS+= -Wl,-R${LOCALBASE}/lib
. endif
@@ -594,6 +594,14 @@ MESSAGE_SUBST+= PKGNAME=${PKGNAME} \
MESSAGE_SUBST_SED= ${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}
.endif
+.if ${OPSYS} == "IRIX"
+PKGCONFIG_OVERRIDE_SED= \
+ '-e s|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,-rpath,\2 -L\2\3|'
+.else
+PKGCONFIG_OVERRIDE_SED= \
+ '-e s|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|'
+.endif
+
# Latest version of digest(1) required for pkgsrc
DIGEST_REQD= 20010302
@@ -1883,13 +1891,8 @@ do-pkgconfig-override:
${_PKG_SILENT}${_PKG_DEBUG} \
if [ -f ${pkgconfig} ]; then \
${MV} ${pkgconfig} ${pkgconfig}.norpath ; \
-. if ${OPSYS} == "IRIX"
- ${SED} -e 's|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,-rpath -Wl,\2 -L\2\3|' \
- < ${pkgconfig}.norpath > ${pkgconfig} ; \
-. else
- ${SED} -e 's|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|' \
+ ${SED} ${PKGCONFIG_OVERRIDE_SED} \
< ${pkgconfig}.norpath > ${pkgconfig} ; \
-. endif
fi
. endfor
.endif