diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-02-26 10:40:46 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-02-26 10:40:46 +0000 |
| commit | 021b7a2bc5789c2bb1e44e2e11afe44d7ac0e3fc (patch) | |
| tree | ff8fd1a4c0750c84393e510d79de36b866b2aac9 | |
| parent | d6cced64abc0517bc290cf22d3924120fe563b16 (diff) | |
| download | pkgsrc-021b7a2bc5789c2bb1e44e2e11afe44d7ac0e3fc.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.
| -rw-r--r-- | devel/libtool-base/Makefile | 6 | ||||
| -rw-r--r-- | devel/libtool-fortran/Makefile | 6 | ||||
| -rw-r--r-- | mk/wrapper/scan | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index cf2b60d62b4..d6a14c5a3de 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2013/08/27 15:50:23 joerg Exp $ +# $NetBSD: Makefile,v 1.105 2014/02/26 10:40:46 jperkin Exp $ ########################################################################### ########################################################################### @@ -67,7 +67,9 @@ USE_TOOLS+= echo .PHONY: fix-libtool fix-libtool: cd ${WRKSRC}; for f in libtool; do \ - ${SED} -e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new; \ + ${SED} -e "s,-L${BUILDLINK_DIR}/lib *,," \ + -e "s,${BUILDLINK_DIR}/lib *,," \ + $$f > $$f.new; \ if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi; \ ${MV} -f $$f.new $$f; \ done diff --git a/devel/libtool-fortran/Makefile b/devel/libtool-fortran/Makefile index 4a4a8dae45d..47535ebffbc 100644 --- a/devel/libtool-fortran/Makefile +++ b/devel/libtool-fortran/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/08/27 15:50:23 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2014/02/26 10:40:46 jperkin Exp $ ########################################################################### ########################################################################### @@ -70,7 +70,9 @@ INSTALLATION_DIRS+= bin .PHONY: fix-libtool fix-libtool: cd ${WRKSRC}; for f in libtool; do \ - ${SED} -e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new; \ + ${SED} -e "s,-L${BUILDLINK_DIR}/lib *,," \ + -e "s,${BUILDLINK_DIR}/lib *,," \ + $$f > $$f.new; \ if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi; \ ${MV} -f $$f.new $$f; \ done 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 |