summaryrefslogtreecommitdiff
path: root/mk/plist
diff options
context:
space:
mode:
authorjlam <jlam>2006-03-30 03:02:40 +0000
committerjlam <jlam>2006-03-30 03:02:40 +0000
commite2bc1b1cbd182d4dd322d5d167c4b022872dcbe7 (patch)
tree8795a46311eb8f67aba1db18b177407fae6ffa13 /mk/plist
parenta3694da6d998b5c8b6376c8a238e88f31386fd88 (diff)
downloadpkgsrc-e2bc1b1cbd182d4dd322d5d167c4b022872dcbe7.tar.gz
Skip symlinks without emitting warnings during PLIST creation as these
are harmless.
Diffstat (limited to 'mk/plist')
-rwxr-xr-xmk/plist/libtool-expand17
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