pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/wrapper Set argmatch=yes when we transform /some/wh...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9579af579820
branches:  trunk
changeset: 488227:9579af579820
user:      cube <cube%pkgsrc.org@localhost>
date:      Tue Jan 25 23:27:34 2005 +0000

description:
Set argmatch=yes when we transform /some/where/libfoo.so into
-L/some/where -lfoo so that the arguments we push on the stack are actually
used in logic.

Should solve the issue build bash with option 'static' enabled reported on
netbsd-users.

OK'd by jlam@.

diffstat:

 mk/wrapper/arg-pp-main |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r b084ba977c96 -r 9579af579820 mk/wrapper/arg-pp-main
--- a/mk/wrapper/arg-pp-main    Tue Jan 25 23:07:05 2005 +0000
+++ b/mk/wrapper/arg-pp-main    Tue Jan 25 23:27:34 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-main,v 1.1 2005/01/18 17:25:13 jlam Exp $
+# $NetBSD: arg-pp-main,v 1.2 2005/01/25 23:27:34 cube Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -51,6 +51,7 @@
        $debug_log $wrapperlog "    (arg-pp-main) pre:  -l$lib"
        prepend_queue argbuf "-L$dir"
        $debug_log $wrapperlog "    (arg-pp-main) pre:  -L$dir"
+       argmatch=yes
        ;;
 /*/lib*.sl|/*/lib*.sl.[0-9]*)  # HP-UX
        dir="${arg%/lib*}"
@@ -64,6 +65,7 @@
        $debug_log $wrapperlog "    (arg-pp-main) pre:  -l$lib"
        prepend_queue argbuf "-L$dir"
        $debug_log $wrapperlog "    (arg-pp-main) pre:  -L$dir"
+       argmatch=yes
        ;;
 /*/lib*.dylib)  # Darwin      
        dir="${arg%/lib*.dylib}"
@@ -76,6 +78,7 @@
        $debug_log $wrapperlog "    (arg-pp-main) pre:  -l$lib"
        prepend_queue argbuf "-L$dir"
        $debug_log $wrapperlog "    (arg-pp-main) pre:  -L$dir"
+       argmatch=yes
        ;;
 ######################################################################
 # Remove extraneous comma in "-Wl,-R,/dir" and in "-Wl,-L,/dir".



Home | Main Index | Thread Index | Old Index