diff options
| author | jlam <jlam> | 2004-02-12 20:29:34 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-12 20:29:34 +0000 |
| commit | 45d8ca37c5ba2a3038b64bccdbee1ab69d80d3b2 (patch) | |
| tree | 487b9031197167bb96126c0e8c7a32844947d983 | |
| parent | 4d27e4f85e0783c97141648f1f6a6777f189cc50 (diff) | |
| download | pkgsrc-45d8ca37c5ba2a3038b64bccdbee1ab69d80d3b2.tar.gz | |
Move a test from the reorderlibs script out to the wrapper scripts for
efficiency reasons.
| -rw-r--r-- | mk/buildlink3/gen-transform.sh | 4 | ||||
| -rw-r--r-- | mk/buildlink3/libtool.sh | 7 | ||||
| -rw-r--r-- | mk/buildlink3/wrapper.sh | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh index 683abd85357..389049d7c22 100644 --- a/mk/buildlink3/gen-transform.sh +++ b/mk/buildlink3/gen-transform.sh @@ -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 @@ EOF @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 --git a/mk/buildlink3/libtool.sh b/mk/buildlink3/libtool.sh index 8d2602ec55a..4c6b374c8c7 100644 --- a/mk/buildlink3/libtool.sh +++ b/mk/buildlink3/libtool.sh @@ -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 @@ esac # 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 --git a/mk/buildlink3/wrapper.sh b/mk/buildlink3/wrapper.sh index 17af9efc10d..372d6d863e3 100644 --- a/mk/buildlink3/wrapper.sh +++ b/mk/buildlink3/wrapper.sh @@ -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 @@ done # Reorder the libraries so that the library dependencies are correct. case $reorder in yes) - . $reorderlibs + if $test -n "$libs"; then + . $reorderlibs + fi ;; esac |