diff options
| author | richard <richard@pkgsrc.org> | 2015-11-20 05:49:24 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2015-11-20 05:49:24 +0000 |
| commit | 8bcef8c7ca4dfb1207e0e1ef2501f112b1c2d855 (patch) | |
| tree | 4e7e6699e3c2e8fb9eb43361eb846993884cd0f9 | |
| parent | 1cef812e5b615a2640cc08541ab72fc869e07f1d (diff) | |
| download | pkgsrc-8bcef8c7ca4dfb1207e0e1ef2501f112b1c2d855.tar.gz | |
PR pkg/47404
wrapper should convert '--rpath' to '-rpath', fixing pysvn as well as
many other packages inadvertently using double-dash form of rpath.
| -rw-r--r-- | mk/wrapper/arg-source | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/wrapper/arg-source b/mk/wrapper/arg-source index 111bb4d63f1..9336414edbf 100644 --- a/mk/wrapper/arg-source +++ b/mk/wrapper/arg-source @@ -1,4 +1,4 @@ -# $NetBSD: arg-source,v 1.15 2007/09/19 13:08:19 rillig Exp $ +# $NetBSD: arg-source,v 1.16 2015/11/20 05:49:24 richard Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -88,6 +88,7 @@ while $test $# -gt 0; do ############################################################## # Split "-Wl,-R/dir1:/dir2" into "-Wl,-R/dir1 -Wl,-R/dir2". # Same for -R and -Wl,-rpath and -Wl,-rpath-link. + # (at the same time suppress the double dash in --rpath to -rpath) ############################################################## -R*:*|-Wl,-R*:*|\ -Wl,-rpath,*:*|-Wl,-rpath-link,*:*|-Wl,--rpath,*:*) @@ -96,7 +97,7 @@ while $test $# -gt 0; do -Wl,-R*) R="-Wl,-R" ;; -Wl,-rpath,*) R="-Wl,-rpath," ;; -Wl,-rpath-link,*) R="-Wl,-rpath-link," ;; - -Wl,--rpath,*) R="-Wl,--rpath," ;; + -Wl,--rpath,*) R="-Wl,-rpath," ;; esac list="${arg#$R}" save_IFS="${IFS}"; IFS=":" @@ -111,6 +112,7 @@ while $test $# -gt 0; do # Merge and split "-Wl,-R -Wl,/dir1:/dir2" into # "-Wl,-R/dir1 -Wl,-R/dir2". Same for -Wl,-rpath and # -Wl,-rpath-link. + # (at the same time suppress the double dash in --rpath to -rpath) ############################################################## -Wl,-R|-Wl,-rpath|-Wl,-rpath-link|-Wl,--rpath) nextarg="$1"; shift @@ -118,7 +120,7 @@ while $test $# -gt 0; do -Wl,-R) R="-Wl,-R" ;; -Wl,-rpath) R="-Wl,-rpath," ;; -Wl,-rpath-link) R="-Wl,-rpath-link," ;; - -Wl,--rpath) R="-Wl,--rpath," ;; + -Wl,--rpath) R="-Wl,-rpath," ;; esac nextarg="${nextarg#-Wl,}" case $nextarg in |