[pkgsrc/trunk]: pkgsrc/mk/wrapper Move some Darwin-specific code from arg-pp-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61315ffd69a0
branches:  trunk
changeset: 489020:61315ffd69a0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 14 21:33:36 2005 +0000

description:
Move some Darwin-specific code from arg-pp-main into arg-pp-darwin-gcc.

diffstat:

 mk/wrapper/arg-pp-darwin-gcc |  23 ++++++++++++++++++++++-
 mk/wrapper/arg-pp-main       |  19 +------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diffs (70 lines):

diff -r 2fa79fef5ab9 -r 61315ffd69a0 mk/wrapper/arg-pp-darwin-gcc
--- a/mk/wrapper/arg-pp-darwin-gcc      Mon Feb 14 21:33:08 2005 +0000
+++ b/mk/wrapper/arg-pp-darwin-gcc      Mon Feb 14 21:33:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-darwin-gcc,v 1.1 2005/01/18 17:25:13 jlam Exp $
+# $NetBSD: arg-pp-darwin-gcc,v 1.2 2005/02/14 21:33:36 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -36,6 +36,27 @@
 
 case $arg in
 ######################################################################
+# Split direct paths to Darwin "dylib" shared libraries into the
+# "-Ldir -llib" equivalent.
+######################################################################
+/*/lib*.dylib)
+       dir="${arg%/lib*.dylib}"
+       lib="${arg#$dir/lib}"
+       case $lib in
+       */*)            argok=yes; argmatch=yes ;;
+       *.dylib)        lib="${lib%.dylib}" ;;
+       esac
+       case $argmatch in
+       yes)    ;;
+       *)      prepend_queue argbuf "-l$lib"
+               $debug_log $wrapperlog "    (arg-pp-darwin-gcc) pre:  -l$lib"
+               prepend_queue argbuf "-L$dir"
+               $debug_log $wrapperlog "    (arg-pp-darwin-gcc) pre:  -L$dir"
+               argmatch=yes
+               ;;
+       esac
+       ;;
+######################################################################
 # Darwin's linker uses:
 #
 #      -dylib_file /path/shlib:/path2/shlib
diff -r 2fa79fef5ab9 -r 61315ffd69a0 mk/wrapper/arg-pp-main
--- a/mk/wrapper/arg-pp-main    Mon Feb 14 21:33:08 2005 +0000
+++ b/mk/wrapper/arg-pp-main    Mon Feb 14 21:33:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-main,v 1.3 2005/01/26 05:03:11 jlam Exp $
+# $NetBSD: arg-pp-main,v 1.4 2005/02/14 21:33:36 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -75,23 +75,6 @@
                ;;
        esac
        ;;
-/*/lib*.dylib)  # Darwin      
-       dir="${arg%/lib*.dylib}"
-       lib="${arg#$dir/lib}" 
-       case $lib in
-       */*)            argok=yes; argmatch=yes ;;
-       *.dylib)        lib="${lib%.dylib}" ;;
-       esac
-       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".
 ######################################################################