pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 In the rpath transformations, also handl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3a365aa2d08
branches:  trunk
changeset: 479285:b3a365aa2d08
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Aug 10 15:13:25 2004 +0000

description:
In the rpath transformations, also handle -Wl,@_OPSYS_RPATH_NAME@... in
case ${_OPSYS_RPATH_NAME} is something surprising, like "-L".

diffstat:

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

diffs (51 lines):

diff -r fdd34957f1e6 -r b3a365aa2d08 mk/buildlink3/gen-transform.sh
--- a/mk/buildlink3/gen-transform.sh    Tue Aug 10 15:11:58 2004 +0000
+++ b/mk/buildlink3/gen-transform.sh    Tue Aug 10 15:13:25 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.27 2004/06/04 19:21:23 tv Exp $
+# $NetBSD: gen-transform.sh,v 1.28 2004/08/10 15:13:25 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -93,6 +93,7 @@
                gen $action mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
                gen $action mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
                gen $action mangle:-Wl,-R$2:-Wl,-R$3
+               gen $action mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
                gen $action mangle:-R$2:-R$3
                ;;
        sub-rpath)
@@ -101,6 +102,7 @@
                gen $action sub-mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
                gen $action sub-mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
                gen $action sub-mangle:-Wl,-R$2:-Wl,-R$3
+               gen $action sub-mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
                gen $action sub-mangle:-R$2:-R$3
                ;;
        abs-rpath)
@@ -109,6 +111,7 @@
                gen $action __r:-Wl,-rpath-link,\\.
                gen $action __r:-Wl,-rpath,\\.
                gen $action __r:-Wl,-R\\.
+               gen $action __r:-Wl,@_OPSYS_RPATH_NAME@\\.
                gen $action __r:-R\\.
                ;;
        no-rpath)
@@ -117,6 +120,7 @@
                gen $action __r:-Wl,-rpath-link,
                gen $action __r:-Wl,-rpath,
                gen $action __r:-Wl,-R
+               gen $action __r:-Wl,@_OPSYS_RPATH_NAME@
                gen $action __r:-R
                ;;
        reorder)
@@ -270,6 +274,7 @@
                gen $action $r:-Wl,-rpath-link,$2
                gen $action $r:-Wl,-rpath,$2
                gen $action $r:-Wl,-R$2
+               gen $action $r:-Wl,@_OPSYS_RPATH_NAME@$2
                gen $action $r:-R$2
                ;;
        S)



Home | Main Index | Thread Index | Old Index