[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Do as buildlink2 and _append_ extra flag...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28b3ff865841
branches:  trunk
changeset: 463773:28b3ff865841
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 26 12:52:30 2003 +0000

description:
Do as buildlink2 and _append_ extra flags instead of prepending them.
Prepending caused everything in ${BUILDLINK_DIR} to be found first, which
was bad when you built something like MesaLib where the X11R6 headers
conflict with the ones provided in the source.

diffstat:

 mk/buildlink3/libtool.sh |  6 +++---
 mk/buildlink3/wrapper.sh |  5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 5a2fc7817001 -r 28b3ff865841 mk/buildlink3/libtool.sh
--- a/mk/buildlink3/libtool.sh  Wed Nov 26 12:42:12 2003 +0000
+++ b/mk/buildlink3/libtool.sh  Wed Nov 26 12:52:30 2003 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: libtool.sh,v 1.8 2003/11/25 14:43:23 jlam Exp $
+# $NetBSD: libtool.sh,v 1.9 2003/11/26 12:52:30 jlam Exp $
 
 Xsed='@SED@ -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -40,6 +40,7 @@
 # Argument buffers
 buf1=; buf2=; buf3=; buf4=; buf5=
 
+# Discover the libtool mode by examining the argument list.
 mode=link
 prevopt=
 nonopt=
@@ -121,8 +122,7 @@
                *cc|*++|gcc*|*-gcc*|*CC)
                        case $mode in
                        link)
-                               cmd="$cmd $arg"
-                               arg="@_BLNK_WRAP_EXTRA_FLAGS@"
+                               set -- "$@" @_BLNK_WRAP_EXTRA_FLAGS@
                                ;;
                        esac
                        ;;
diff -r 5a2fc7817001 -r 28b3ff865841 mk/buildlink3/wrapper.sh
--- a/mk/buildlink3/wrapper.sh  Wed Nov 26 12:42:12 2003 +0000
+++ b/mk/buildlink3/wrapper.sh  Wed Nov 26 12:52:30 2003 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: wrapper.sh,v 1.5 2003/10/09 12:15:15 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.6 2003/11/26 12:52:30 jlam Exp $
 
 Xsed='@SED@ -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -37,7 +37,8 @@
 # Argument buffers
 buf1=; buf2=; buf3=; buf4=; buf5=
 
-cmd="@WRAPPEE@ @_BLNK_WRAP_EXTRA_FLAGS@"
+cmd="@WRAPPEE@"
+set -- "$@" @_BLNK_WRAP_EXTRA_FLAGS@
 while $test $# -gt 0 -o -n "${buf1}${buf2}${buf3}${buf4}${buf5}"; do
        cachehit=no
        skipcache=no