[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Move a test from the reorderlibs script ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef2aaba0b86e
branches:  trunk
changeset: 468336:ef2aaba0b86e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 12 20:29:34 2004 +0000

description:
Move a test from the reorderlibs script out to the wrapper scripts for
efficiency reasons.

diffstat:

 mk/buildlink3/gen-transform.sh |  4 ++--
 mk/buildlink3/libtool.sh       |  7 +++++--
 mk/buildlink3/wrapper.sh       |  6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diffs (65 lines):

diff -r 5a63e2bbe891 -r ef2aaba0b86e mk/buildlink3/gen-transform.sh
--- a/mk/buildlink3/gen-transform.sh    Thu Feb 12 20:20:35 2004 +0000
+++ b/mk/buildlink3/gen-transform.sh    Thu Feb 12 20:29:34 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.22 2004/02/12 20:20:35 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.23 2004/02/12 20:29:34 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -310,7 +310,7 @@
 @CAT@ > $reorderlibs << EOF
 \$echo "==> Reordering libraries: \$libs" >> \$wrapperlog
 prevlibs=
-while \$test "\$libs" != "\$prevlibs" -a -n "\$libs"; do
+while \$test "\$libs" != "\$prevlibs"; do
        _libs=
        for l in \$libs; do
                case \$l in
diff -r 5a63e2bbe891 -r ef2aaba0b86e mk/buildlink3/libtool.sh
--- a/mk/buildlink3/libtool.sh  Thu Feb 12 20:20:35 2004 +0000
+++ b/mk/buildlink3/libtool.sh  Thu Feb 12 20:29:34 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: libtool.sh,v 1.14 2004/01/30 10:56:11 jlam Exp $
+# $NetBSD: libtool.sh,v 1.15 2004/02/12 20:29:34 jlam Exp $
 
 Xsed='@SED@ -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -169,7 +169,10 @@
 # Reorder the libraries so that the library dependencies are correct.
 case $reorder in
 yes)
-       . $reorderlibs
+       if $test -n "$libs"; then
+               . $reorderlibs
+       fi
+       ;;
 esac
 
 cmd="$cmd $ldflags $libs"
diff -r 5a63e2bbe891 -r ef2aaba0b86e mk/buildlink3/wrapper.sh
--- a/mk/buildlink3/wrapper.sh  Thu Feb 12 20:20:35 2004 +0000
+++ b/mk/buildlink3/wrapper.sh  Thu Feb 12 20:29:34 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: wrapper.sh,v 1.10 2004/01/30 10:56:11 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.11 2004/02/12 20:29:34 jlam Exp $
 
 Xsed='@SED@ -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -80,7 +80,9 @@
 # Reorder the libraries so that the library dependencies are correct.
 case $reorder in
 yes)
-       . $reorderlibs
+       if $test -n "$libs"; then
+               . $reorderlibs
+       fi
        ;;
 esac