pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Fixed two scripts so that they also run ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/47fa24cd12ef
branches:  trunk
changeset: 521297:47fa24cd12ef
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 09 02:07:59 2006 +0000

description:
Fixed two scripts so that they also run when "set -u" is in effect.

diffstat:

 mk/buildlink3/libtool-fix-la    |  3 ++-
 mk/buildlink3/transform-libtool |  6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r e07eac88c226 -r 47fa24cd12ef mk/buildlink3/libtool-fix-la
--- a/mk/buildlink3/libtool-fix-la      Thu Nov 09 02:06:29 2006 +0000
+++ b/mk/buildlink3/libtool-fix-la      Thu Nov 09 02:07:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-fix-la,v 1.7 2005/12/09 16:16:41 hira Exp $
+# $NetBSD: libtool-fix-la,v 1.8 2006/11/09 02:07:59 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -131,6 +131,7 @@
                esac
        done
 
+       : ${relink_command=""}
        relink=
        for i in ${relink_command}; do
                case $i in
diff -r e07eac88c226 -r 47fa24cd12ef mk/buildlink3/transform-libtool
--- a/mk/buildlink3/transform-libtool   Thu Nov 09 02:06:29 2006 +0000
+++ b/mk/buildlink3/transform-libtool   Thu Nov 09 02:07:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: transform-libtool,v 1.2 2004/10/03 21:39:07 jlam Exp $
+# $NetBSD: transform-libtool,v 1.3 2006/11/09 02:07:59 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -83,7 +83,7 @@
                la="$dir/lib$lib.la"
                if $test -f "$la"; then
                        ldir=`cd $dir; $pwd`
-                       buildlibdir=`. $la; $echo $buildlibdir`
+                       buildlibdir=`. $la; $echo ${buildlibdir-}`
                        if $test -n "$buildlibdir" -a \
                                 "$ldir" != "$buildlibdir"; then
                                la="$buildlibdir/lib$lib.la"
@@ -107,7 +107,7 @@
        labase=`$basename $arg`
        ladir=`$dirname $arg`
        ldir=`cd $ladir; $pwd`
-       buildlibdir=`. $ladir/$labase; $echo $buildlibdir`
+       buildlibdir=`. $ladir/$labase; $echo ${buildlibdir-}`
        if $test -n "$buildlibdir" -a "$ldir" != "$buildlibdir" -a \
                 -e "$buildlibdir/$labase"; then
                arg="$buildlibdir/$labase"



Home | Main Index | Thread Index | Old Index