pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/scripts Don't expand .la files in PLISTs that are s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/05dab0d375c8
branches:  trunk
changeset: 483486:05dab0d375c8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 12 21:21:08 2004 +0000

description:
Don't expand .la files in PLISTs that are symlinks.  The expansion should
only occur with the real .la file.  This avoids the problem noted by
Greg Troxel in:

        http://mail-index.netbsd.org/tech-pkg/2004/11/12/0018.html

diffstat:

 mk/scripts/print-la-libnames |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 607d02d4e5c5 -r 05dab0d375c8 mk/scripts/print-la-libnames
--- a/mk/scripts/print-la-libnames      Fri Nov 12 20:53:32 2004 +0000
+++ b/mk/scripts/print-la-libnames      Fri Nov 12 21:21:08 2004 +0000
@@ -1,6 +1,6 @@
 # /bin/sh
 #
-# $NetBSD: print-la-libnames,v 1.3 2004/10/05 22:34:07 jlam Exp $
+# $NetBSD: print-la-libnames,v 1.4 2004/11/12 21:21:08 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -56,7 +56,7 @@
        *)      lapath="./$la" ;;
        esac
 
-       if [ -r "$lapath" ]; then
+       if [ -r "$lapath" -a ! -h "$lapath" ]; then
                if ${GREP} -q "libtool library file" "$lapath"; then
                        . "$lapath"
                        if [ "$installed" = "no" ]; then



Home | Main Index | Thread Index | Old Index