[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Fix overly aggressive substitution patte...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52d991a89ef9
branches:  trunk
changeset: 466412:52d991a89ef9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Jan 17 17:33:49 2004 +0000

description:
Fix overly aggressive substitution pattern in abs-rpath to allow things
like "-Wl,-R${exec_prefix}/lib".  This fixes any breakage in *-config
scripts where the above example was being stripped out.

diffstat:

 mk/buildlink3/gen-transform.sh |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 42dc6ffe74c5 -r 52d991a89ef9 mk/buildlink3/gen-transform.sh
--- a/mk/buildlink3/gen-transform.sh    Sat Jan 17 17:14:48 2004 +0000
+++ b/mk/buildlink3/gen-transform.sh    Sat Jan 17 17:33:49 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.11 2004/01/13 07:52:37 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.12 2004/01/17 17:33:49 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -59,12 +59,12 @@
                gen $action mangle:-R$2:-R$3
                ;;
        abs-rpath)
-               gen $action __r:-Wl,--rpath-link,[^/]
-               gen $action __r:-Wl,--rpath,[^/]
-               gen $action __r:-Wl,-rpath-link,[^/]
-               gen $action __r:-Wl,-rpath,[^/]
-               gen $action __r:-Wl,-R[^/]
-               gen $action __r:-R[^/]
+               gen $action __r:-Wl,--rpath-link,[^/\$]
+               gen $action __r:-Wl,--rpath,[^/\$]
+               gen $action __r:-Wl,-rpath-link,[^/\$]
+               gen $action __r:-Wl,-rpath,[^/\$]
+               gen $action __r:-Wl,-R[^/\$]
+               gen $action __r:-R[^/\$]
                ;;
        no-rpath)
                gen $action _r:-Wl,--rpath-link,