diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-30 03:02:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-30 03:02:40 +0000 |
| commit | df10fbdf668d7607522042713c5d74d29796f9b9 (patch) | |
| tree | 8795a46311eb8f67aba1db18b177407fae6ffa13 | |
| parent | 7010768d97f9850c07009352fbc9a19e4add30b3 (diff) | |
| download | pkgsrc-df10fbdf668d7607522042713c5d74d29796f9b9.tar.gz | |
Skip symlinks without emitting warnings during PLIST creation as these
are harmless.
| -rwxr-xr-x | mk/plist/libtool-expand | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/mk/plist/libtool-expand b/mk/plist/libtool-expand index b1a353afe85..6f0c72af686 100755 --- a/mk/plist/libtool-expand +++ b/mk/plist/libtool-expand @@ -1,6 +1,6 @@ # /bin/sh # -# $NetBSD: libtool-expand,v 1.1 2006/01/12 23:43:57 jlam Exp $ +# $NetBSD: libtool-expand,v 1.2 2006/03/30 03:02:40 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -65,7 +65,17 @@ do *) lapath="./$la" ;; esac - if ${TEST} -r "$lapath" -a ! -h "$lapath"; then + # Skip symlinks to libtool archives -- we only want to expand the + # real libtool archive. + # + ${TEST} ! -h "$lapath" || continue + + # Skip unreadable *.la files. + if ${TEST} ! -f "$lapath" -o ! -r "$lapath" ; then + ${ECHO} 1>&2 "$self: cannot read libtool archive \`$lapath'" + continue + fi + if ${GREP} -q "libtool library file" "$lapath"; then . "$lapath" if ${TEST} "$installed" = "no"; then @@ -80,7 +90,4 @@ do ${ECHO} "$libpath" done fi - else - ${ECHO} 1>&2 "$self: cannot read libtool archive \`$lapath'" - fi done | ${SORT} -u |