summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin>2014-02-26 10:40:46 +0000
committerjperkin <jperkin>2014-02-26 10:40:46 +0000
commit7f3aee6875c914b9ff951b8cf286b5971000eaa9 (patch)
treeff8fd1a4c0750c84393e510d79de36b866b2aac9 /mk
parentcfcc1f93dddeedbadec1c961856d17a41c6c8746 (diff)
downloadpkgsrc-7f3aee6875c914b9ff951b8cf286b5971000eaa9.tar.gz
Remove special handling of -v in the wrappers.
This was originally introduced to work around some behaviour in the libtool build, however these days it is actively harmful for a number of packages, where removing additional arguments when -v is present on the command line can break ABI detection (notably in CMake packages). Instead, filter out any references to BUILDLINK_DIR from the libtool scripts, as that should do the same job. Retain the ability to run the 'scan' wrapper script, as it can be useful in certain cases, and is required to support the scan-libtool script anyway.
Diffstat (limited to 'mk')
-rw-r--r--mk/wrapper/scan5
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/wrapper/scan b/mk/wrapper/scan
index dcb5fb1b11f..95ce1e6777d 100644
--- a/mk/wrapper/scan
+++ b/mk/wrapper/scan
@@ -1,4 +1,4 @@
-# $NetBSD: scan,v 1.1 2004/10/04 20:28:30 jlam Exp $
+# $NetBSD: scan,v 1.2 2014/02/26 10:40:46 jperkin Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,10 +35,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# Don't append extra arguments if "-v" is passed to the command.
+# Optional argument processing.
for arg do
case $arg in
- -v) append_extra_args=no; break ;;
*) ;;
esac
done