pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/plist Skip symlinks without emitting warnings durin...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5b73162bf21
branches:  trunk
changeset: 510414:b5b73162bf21
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 30 03:02:40 2006 +0000

description:
Skip symlinks without emitting warnings during PLIST creation as these
are harmless.

diffstat:

 mk/plist/libtool-expand |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r ddebf59b57f0 -r b5b73162bf21 mk/plist/libtool-expand
--- a/mk/plist/libtool-expand   Thu Mar 30 03:02:01 2006 +0000
+++ b/mk/plist/libtool-expand   Thu Mar 30 03:02:40 2006 +0000
@@ -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 @@
        *)      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 @@
                                ${ECHO} "$libpath"
                        done
                fi
-       else
-               ${ECHO} 1>&2 "$self: cannot read libtool archive \`$lapath'"
-       fi
 done | ${SORT} -u



Home | Main Index | Thread Index | Old Index