[pkgsrc/trunk]: pkgsrc/mk/wrapper Fix so that we preserve /usr/lib/foo.so on ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/566f7f741495
branches:  trunk
changeset: 488237:566f7f741495
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 26 05:03:11 2005 +0000

description:
Fix so that we preserve /usr/lib/foo.so on the command line.

diffstat:

 mk/wrapper/arg-pp-main |  44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diffs (72 lines):

diff -r fa4ef2454923 -r 566f7f741495 mk/wrapper/arg-pp-main
--- a/mk/wrapper/arg-pp-main    Wed Jan 26 05:01:44 2005 +0000
+++ b/mk/wrapper/arg-pp-main    Wed Jan 26 05:03:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-main,v 1.2 2005/01/25 23:27:34 cube Exp $
+# $NetBSD: arg-pp-main,v 1.3 2005/01/26 05:03:11 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -47,11 +47,15 @@
        *.so)           lib="${lib%.so}" ;;
        *.so.[0-9]*)    lib="${lib%.so.[0-9]*}" ;;
        esac
-       prepend_queue argbuf "-l$lib"
-       $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
+       case $argmatch in
+       yes)    ;;
+       *)      prepend_queue argbuf "-l$lib"
+               $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
+               ;;
+       esac
        ;;
 /*/lib*.sl|/*/lib*.sl.[0-9]*)  # HP-UX
        dir="${arg%/lib*}"
@@ -61,11 +65,15 @@
        *.sl)           lib="${lib%.sl}" ;;
        *.sl.[0-9]*)    lib="${lib%.sl.[0-9]*}" ;;
        esac
-       prepend_queue argbuf "-l$lib"
-       $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
+       case $argmatch in
+       yes)    ;;
+       *)      prepend_queue argbuf "-l$lib"
+               $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
+               ;;
+       esac
        ;;
 /*/lib*.dylib)  # Darwin      
        dir="${arg%/lib*.dylib}"
@@ -74,11 +82,15 @@
        */*)            argok=yes; argmatch=yes ;;
        *.dylib)        lib="${lib%.dylib}" ;;
        esac
-       prepend_queue argbuf "-l$lib"
-       $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
+       case $argmatch in
+       yes)    ;;
+       *)      prepend_queue argbuf "-l$lib"
+               $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
+               ;;
+       esac
        ;;
 ######################################################################
 # Remove extraneous comma in "-Wl,-R,/dir" and in "-Wl,-L,/dir".