diff options
author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
---|---|---|
committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
commit | f69d0aee59b843edb712e3c7201d67c1860a9902 (patch) | |
tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /cross | |
parent | 2045c3a17f778f4291f00ac8495b025fac1eb26c (diff) | |
download | pkgsrc-f69d0aee59b843edb712e3c7201d67c1860a9902.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 'cross')
-rw-r--r-- | cross/bfd-crunchide/Makefile | 7 | ||||
-rw-r--r-- | cross/bfd-mdsetimage/Makefile | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile index 131d9ea8637..c6047f6933e 100644 --- a/cross/bfd-crunchide/Makefile +++ b/cross/bfd-crunchide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:17 agc Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/14 19:37:33 jlam Exp $ DISTNAME= bfd-crunchide-1.1 CATEGORIES= cross @@ -20,7 +20,10 @@ USE_CROSSBASE= yes BFD_VERSION= 2.9.1 CPPFLAGS+= -I${PREFIX}/include MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \ - LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty" + LIBS="${BFD_LIBS}" + +FIX_RPATH+= BFD_LIBS +BFD_LIBS= -L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty do-extract: @${MKDIR} ${WRKSRC} diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile index 54c13b3fd0f..c0351d7db98 100644 --- a/cross/bfd-mdsetimage/Makefile +++ b/cross/bfd-mdsetimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:18 agc Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/14 19:37:33 jlam Exp $ DISTNAME= bfd-mdsetimage-1.15.1 CATEGORIES= cross @@ -20,7 +20,10 @@ USE_CROSSBASE= yes BFD_VERSION= 2.9.1 CPPFLAGS+= -I${PREFIX}/include MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \ - LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty" + LIBS="${BFD_LIBS}" + +FIX_RPATH+= BFD_LIBS +BFD_LIBS= -L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty do-extract: @${MKDIR} ${WRKSRC} |