diff options
| author | jlam <jlam> | 2003-01-07 07:34:08 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-07 07:34:08 +0000 |
| commit | 06255e8ec4b123c94c5f1e6acfdc3c1be18100db (patch) | |
| tree | a4faaafb2e859ea1dcca3cd90651b7b5ecaf2b8e /mk | |
| parent | bafb39dbf33d9e65e8d10539e4976c430e05b4e5 (diff) | |
| download | pkgsrc-06255e8ec4b123c94c5f1e6acfdc3c1be18100db.tar.gz | |
Don't complain about (correct) .buildlink leakage in the fake libtool
archive case. Also output errors to stderr, not stdout (duh!).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink2/libtool-fix-la | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index 545c2d3b154..c40bd5a83dd 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.16 2003/01/06 09:06:09 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.17 2003/01/07 07:34:08 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -181,9 +181,10 @@ if $test -f $lafile; then ) > ${laifile} @RM@ -f ${laifile}.tmp $echo "==> Fixed $laifile" >> $wrapperlog - if @EGREP@ "${BUILDLINK_X11_DIR}|${BUILDLINK_DIR}" $laifile >/dev/null 2>&1; then + if $test "$libdir" != "${BUILDLINK_DIR}/.tmp/inst" && \ + @EGREP@ "${BUILDLINK_X11_DIR}|${BUILDLINK_DIR}" $laifile >/dev/null 2>&1; then $echo "==> [buildlink2] Error: buildlink2 leakage into $laifile" >> $wrapperlog - $echo "==> [buildlink2] Error: buildlink2 leakage into $laifile" + $echo "==> [buildlink2] Error: buildlink2 leakage into $laifile" 1>&2 wrapper_result=1 fi fi |