diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-09 02:07:59 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-09 02:07:59 +0000 |
| commit | 9855d392a69eab217e00cd517b3fc6888d4095cf (patch) | |
| tree | 5c71ca501d73a3cdf5c2b8793068b8668bdb1be2 /mk/buildlink3 | |
| parent | 7235ba23170e02d7a4fa7012c44b9cdf69ff4823 (diff) | |
| download | pkgsrc-9855d392a69eab217e00cd517b3fc6888d4095cf.tar.gz | |
Fixed two scripts so that they also run when "set -u" is in effect.
Diffstat (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/libtool-fix-la | 3 | ||||
| -rw-r--r-- | mk/buildlink3/transform-libtool | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mk/buildlink3/libtool-fix-la b/mk/buildlink3/libtool-fix-la index e9826513116..ac6f00ebc16 100644 --- a/mk/buildlink3/libtool-fix-la +++ b/mk/buildlink3/libtool-fix-la @@ -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 @@ if $test -f $lafile; then esac done + : ${relink_command=""} relink= for i in ${relink_command}; do case $i in diff --git a/mk/buildlink3/transform-libtool b/mk/buildlink3/transform-libtool index cb7b9ebbb61..bb6eddd52a7 100644 --- a/mk/buildlink3/transform-libtool +++ b/mk/buildlink3/transform-libtool @@ -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 @@ case $arg in 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 @@ case $arg in 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" |