diff options
| author | jlam <jlam> | 2002-12-28 18:58:09 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-12-28 18:58:09 +0000 |
| commit | cf06530c6d58e7aa65386cf611d2953e9b9cbeab (patch) | |
| tree | 8cbc9aa495e0a18fd4b5520973d372ba244ece4d | |
| parent | 183bc10ed587ca2598a9b5cc7b92650142a21cb8 (diff) | |
| download | pkgsrc-cf06530c6d58e7aa65386cf611d2953e9b9cbeab.tar.gz | |
As a refinement on the previous commit, we shouldn't even add .../.libs
directories to the search list for libtool archives. Also make it clear
that the warning comes from the libtool wrapper.
| -rw-r--r-- | mk/buildlink2/libtool-logic | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/mk/buildlink2/libtool-logic b/mk/buildlink2/libtool-logic index 27857393b5f..1891c4ae6b0 100644 --- a/mk/buildlink2/libtool-logic +++ b/mk/buildlink2/libtool-logic @@ -1,15 +1,22 @@ -# $NetBSD: libtool-logic,v 1.2 2002/12/28 18:49:57 jlam Exp $ +# $NetBSD: libtool-logic,v 1.3 2002/12/28 18:58:09 jlam Exp $ case $arg in -L.|-L./*|-L..*|-L${WRKSRC}*) case $fixlibpath in yes) - lpath=`$echo "X$arg" | $Xsed -e "s/^-L//"` - $echo "*** [buildlink2] Warning: deprecated -L$lpath detected" - case "$rellpath" in - *"$lpath "*) ;; - *"$lpath"*) ;; - *) rellpath="$rellpath $lpath" ;; + case $arg in + */.libs) + # ignore -L.../.libs + ;; + *) + $echo "*** [buildlink2] Warning: libtool detected $arg" + lpath=`$echo "X$arg" | $Xsed -e "s/^-L//"` + case "$rellpath" in + *"$lpath "*) ;; + *"$lpath"*) ;; + *) rellpath="$rellpath $lpath" ;; + esac + ;; esac ;; esac @@ -21,7 +28,7 @@ case $arg in for dir in $rellpath; do la="$dir/lib$lib.la" if $test -f "$la"; then - $echo "*** [buildlink2] Warning: replaced $arg with $la" + $echo "*** [buildlink2] Warning: libtool replaced $arg with $la" arg="$la" cachesettings='skipcache=yes' break |