diff options
| author | jlam <jlam> | 2003-01-06 04:30:12 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-06 04:30:12 +0000 |
| commit | 45149620ff2bc05ff47559b2ce4ffc4e9722a017 (patch) | |
| tree | f73c564eb0860c682ef7b9e644bb2f4898ed9e66 /mk/buildlink2 | |
| parent | 1abdf6f26a88a26a7d347c6638a9466693523330 (diff) | |
| download | pkgsrc-45149620ff2bc05ff47559b2ce4ffc4e9722a017.tar.gz | |
Some changes for Bourne shells that don't match NetBSD's feature-set:
if ! test ...; then ...; fi
becomes:
if test ! ...; then ...; fi
and
if ! command; then ...; fi
becomes:
if command; then :; else ...; fi
This fixes PR 19690 by Frank Cusack <fcusack@fcusack.com>.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/fake-la | 4 | ||||
| -rw-r--r-- | mk/buildlink2/libtool-fix-la | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/mk/buildlink2/fake-la b/mk/buildlink2/fake-la index 9959047e050..a2cb11619c2 100644 --- a/mk/buildlink2/fake-la +++ b/mk/buildlink2/fake-la @@ -1,6 +1,6 @@ #!@BUILDLINK_SHELL@ # -# $NetBSD: fake-la,v 1.3 2002/12/22 19:02:44 jlam Exp $ +# $NetBSD: fake-la,v 1.4 2003/01/06 04:30:12 jlam Exp $ BASENAME="@BASENAME@" CC="@CC@" @@ -21,7 +21,7 @@ realdir=`${DIRNAME} $reallib` libname=`${BASENAME} $reallib` tmpdir=${BUILDLINK_DIR}/.tmp -if ! ${TEST} -f $tmpdir/inst/$libbase.la; then +if ${TEST} ! -f $tmpdir/inst/$libbase.la; then case $libname in *.so.[0-9]*) libbase=`${ECHO} $libname | ${SED} -e "s/\.so\.[0-9.]*$//"` diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index 7341b89836c..b53836f66b1 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.14 2002/12/26 17:08:56 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.15 2003/01/06 04:30:12 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -103,8 +103,10 @@ if $test -f $lafile; then ;; esac done - if $test -n "$deps" || $test -n "$relink" && \ - ! @EGREP@ "^#.*modified by buildlink2" $lafile >/dev/null 2>&1; then + if $test -z "$deps" && $test -z "$relink" || \ + @EGREP@ "^#.*modified by buildlink2" $lafile >/dev/null 2>&1; then + : + else @MV@ -f $lafile ${lafile}.blsav if $test -n "$deps"; then ( @@ -129,8 +131,10 @@ if $test -f $lafile; then @RM@ ${lafile}.tmp $echo "==> Fixed $lafile" >> $wrapperlog fi - if $test -n "$laifile" && $test -f "$laifile" && \ - ! @EGREP@ "^#.*modified by buildlink2" $laifile >/dev/null 2>&1; then + if $test -z "$laifile" || $test ! -f "$laifile" || \ + @EGREP@ "^#.*modified by buildlink2" $laifile >/dev/null 2>&1; then + : + else @SED@ @_BLNK_WRAP_LT_UNTRANSFORM_SED@ \ @_BLNK_UNTRANSFORM_SED@ \ $laifile > ${laifile}.tmp |