[pkgsrc/trunk]: pkgsrc/mk/wrapper When mangling paths, also do (and undo) the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/118bd06dcdd9
branches:  trunk
changeset: 480973:118bd06dcdd9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Sep 22 23:00:26 2004 +0000

description:
When mangling paths, also do (and undo) the transformations for full
paths to static archives and libtool archives.  This should fix the
problem where a mangled path sometimes makes its way into the the
executed command line.

diffstat:

 mk/wrapper/gen-transform.sh |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 7b8240af6ef5 -r 118bd06dcdd9 mk/wrapper/gen-transform.sh
--- a/mk/wrapper/gen-transform.sh       Wed Sep 22 22:37:27 2004 +0000
+++ b/mk/wrapper/gen-transform.sh       Wed Sep 22 23:00:26 2004 +0000
@@ -1,6 +1,6 @@
 #! @WRAPPER_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.1 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.2 2004/09/22 23:00:26 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -165,8 +165,9 @@
                ;;
        ##############################################################
        # mangle:src:dst
-       #       Change "src" into "dst" and "src/*" into "dst/*", and the
-       #       same in -I, -L, and rpath options.
+       #       Change "src" into "dst" and "src/*" into "dst/*" in -I,
+       #       -L, and rpath options, and also in full paths to
+       #       libraries.
        ##############################################################
        mangle)
                case $_action in
@@ -406,14 +407,15 @@
                ;;
        ##############################################################
        # sub-mangle:src:dst
-       #       Change "src/*" into "dst/*", and the same in -I, -L, and
-       #       rpath options.
+       #       Change "src/*" into "dst/*" in -I, -L, and rpath
+       #       options, and also in full paths to libraries.
        ##############################################################
        sub-mangle)
                case $_action in
                transform|untransform)
                        $debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
                        #gen $_action "opt-sub:$1:$2"
+                       gen $_action "libpath:$1:$2"
                        gen $_action "opt-sub:-I$1:-I$2"
                        gen $_action "opt-sub:-L$1:-L$2"
                        gen $_action "sub-rpath:$1:$2"