diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-07 07:33:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-07 07:33:14 +0000 |
| commit | 6a3ef162c6c707cb863bf5252f3313c265879699 (patch) | |
| tree | 9f24ee7d03384c4e247a6b6841dd05786d4ec029 | |
| parent | 5bec78319543281beb895a1903980282c786f7d7 (diff) | |
| download | pkgsrc-6a3ef162c6c707cb863bf5252f3313c265879699.tar.gz | |
Filter out -R and -Wl.-R arguments that point to /usr/local as well as
just -I and -L (modulo if LOCALBASE == /usr/local).
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 4 | ||||
| -rw-r--r-- | mk/buildlink2/post-cache | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 3ce9c669f2f..9afc4bbfbb2 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.17 2002/09/06 14:39:41 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.18 2002/09/07 07:33:14 jlam Exp $ # # An example package buildlink2.mk file: # @@ -217,6 +217,8 @@ _BLNK_TRANSFORM+= LL:${X11BASE}:${BUILDLINK_X11PKG_DIR},${BUILDLINK_X11_DIR} . if ${LOCALBASE} != ${_localbase_} _BLNK_TRANSFORM+= r:-I${_localbase_} _BLNK_TRANSFORM+= r:-L${_localbase_} +_BLNK_TRANSFORM+= r:-Wl,-R${_localbase_} +_BLNK_TRANSFORM+= r:-R${_localbase_} . endif .endfor # diff --git a/mk/buildlink2/post-cache b/mk/buildlink2/post-cache index d8e0fee615b..44b7ebaaea8 100644 --- a/mk/buildlink2/post-cache +++ b/mk/buildlink2/post-cache @@ -1,4 +1,4 @@ -# $NetBSD: post-cache,v 1.3 2002/09/03 21:36:18 jlam Exp $ +# $NetBSD: post-cache,v 1.4 2002/09/07 07:33:15 jlam Exp $ *) case $arg in @@ -42,7 +42,7 @@ ;; esac ;; - -[ILl]*|-Wl,*|@LOCALBASE@/*/lib*|@X11BASE@/*/lib*) + -[ILRl]*|-Wl,*|@LOCALBASE@/*/lib*|@X11BASE@/*/lib*) newarg=`@ECHO@ "X$arg" | $Xsed \ @_BLNK_TRANSFORM_SED.1@ \ @_BLNK_TRANSFORM_SED.2@ \ |