diff options
| author | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
| commit | 3ef633718c6eecbd852195de9329d45632a10352 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /lang/perl5 | |
| parent | 1940384395085677c2036358dfcccfad791a4dd8 (diff) | |
| download | pkgsrc-3ef633718c6eecbd852195de9329d45632a10352.tar.gz | |
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/Makefile | 7 | ||||
| -rw-r--r-- | lang/perl5/module.mk | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 02385dcc479..c43e04989b8 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2003/02/27 04:32:33 grant Exp $ +# $NetBSD: Makefile,v 1.63 2003/03/14 19:37:43 jlam Exp $ .include "../../lang/perl5/Makefile.common" @@ -60,10 +60,11 @@ LOCINCPATH= ${LOCALBASE}/include # flags to the link command in the right way. # .if ${OBJECT_FMT} == "a.out" -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-R/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${RPATH_FLAG}/g} .else -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,-R/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,${RPATH_FLAG}/g} .endif +FIX_RPATH+= LOCLIBRPATHFLAGS .if defined(LIBSWANTED.${OPSYS}) CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}" diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index 5473a4c328b..39070fc6a32 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.7 2003/03/05 16:07:44 seb Exp $ +# $NetBSD: module.mk,v 1.8 2003/03/14 19:37:43 jlam Exp $ # # This Makefile fragment is intended to be included by packages that build # and install perl5 modules. @@ -54,6 +54,7 @@ do-configure: perl5-configure # customizing the LDFLAGS passed to the compiler/linker. # .if defined(PERL5_LDFLAGS) && !empty(PERL5_LDFLAGS) +FIX_RPATH+= PERL5_LDFLAGS LDFLAGS+= ${PERL5_LDFLAGS} . include "../../mk/bsd.prefs.mk" . if ${OBJECT_FMT} == "a.out" |