diff options
| author | agc <agc@pkgsrc.org> | 2002-12-03 19:11:30 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2002-12-03 19:11:30 +0000 |
| commit | 7dc9a2b816f7e285a9e49909cce2720ff56d2e65 (patch) | |
| tree | a1e33414c9ec0bf9c163ef260ebc901c5d3ea8d5 /mk/bsd.pkg.mk | |
| parent | 46e932621376c79df30ee0a7c5681ea7dc4a97af (diff) | |
| download | pkgsrc-7dc9a2b816f7e285a9e49909cce2720ff56d2e65.tar.gz | |
Handle the different rpath directive to the linker for Irix in a different,
more generic, way - use an abstraction called ${_OPSYS_RPATH_NAME} which
takes the value "-rpath," or "-R", set appropriately in the opsys-dependent
defs files.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 91621f420e7..90a625e74fd 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1095 2002/12/03 18:57:53 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1096 2002/12/03 19:11:30 agc Exp $ # # This file is in the public domain. # @@ -351,21 +351,13 @@ M4?= /usr/bin/m4 .if defined(USE_X11) X11_LDFLAGS= # empty . if ${_USE_RPATH} == "yes" -. if ${OPSYS} == "IRIX" -X11_LDFLAGS+= -Wl,-rpath,${X11BASE}/lib -. else -X11_LDFLAGS+= -Wl,-R${X11BASE}/lib -. endif +X11_LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${X11BASE}/lib . endif X11_LDFLAGS+= -L${X11BASE}/lib LDFLAGS+= ${X11_LDFLAGS} .endif .if ${_USE_RPATH} == "yes" -. if ${OPSYS} == "IRIX" -LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib -. else -LDFLAGS+= -Wl,-R${LOCALBASE}/lib -. endif +LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${LOCALBASE}/lib .else . if empty(USE_BUILDLINK2:M[nN][oO]) LDFLAGS:= ${LDFLAGS:N*-Wl,-R*:N*-rpath*} @@ -589,13 +581,8 @@ 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 + '-e s|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,${_OPSYS_RPATH_NAME}\2 -L\2\3|' # Latest version of digest(1) required for pkgsrc DIGEST_REQD= 20010302 |