[pkgsrc/trunk]: pkgsrc/mk PR 49686: Drop -I and -L options references the bui...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/626ba3abdbe7
branches:  trunk
changeset: 648601:626ba3abdbe7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Mar 15 19:23:26 2015 +0000

description:
PR 49686: Drop -I and -L options references the built-in search
directories of the compiler/linker when using cwrappers. Command line
flags will often put them before the corresponding flags for
PREFIX/include and PREFIX/lib, so the version from outside .buildlink
would be prefered. The other way around is much less likely to be a
problem and normally the expected case. Bump required cwrappers version
for the necessary exact-match feature.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  10 +++++++++-
 mk/cwrappers.mk                 |   4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 3eb71c0155ad -r 626ba3abdbe7 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Sun Mar 15 19:16:59 2015 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Sun Mar 15 19:23:26 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.232 2014/12/30 15:13:19 wiz Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.233 2015/03/15 19:23:26 joerg Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -812,6 +812,14 @@
 .for _dir_ in ${COMPILER_LIB_DIRS} ${COMPILER_INCLUDE_DIRS} ${LOCALBASE} ${X11BASE}
 _BLNK_PASSTHRU_DIRS:=  ${_BLNK_PASSTHRU_DIRS:N${_dir_}}
 .endfor
+# For cwrappers, drop compiler specific search directories, but keep subdirectories.
+# E.g. /usr/include/openssl should be kept, but /usr/include must be dropped.
+.for _dir_ in ${COMPILER_LIB_DIRS}
+_CWRAPPERS_TRANSFORM+= L:${_dir_}/:
+.endfor
+.for _dir_ in ${COMPILER_INCLUDE_DIRS}
+_CWRAPPERS_TRANSFORM+= I:${_dir_}/:
+.endfor
 #
 # Allow all directories in the library subdirectories listed for each
 # package to be in the runtime library search path.
diff -r 3eb71c0155ad -r 626ba3abdbe7 mk/cwrappers.mk
--- a/mk/cwrappers.mk   Sun Mar 15 19:16:59 2015 +0000
+++ b/mk/cwrappers.mk   Sun Mar 15 19:23:26 2015 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: cwrappers.mk,v 1.20 2014/12/12 10:50:17 joerg Exp $
+# $NetBSD: cwrappers.mk,v 1.21 2015/03/15 19:23:26 joerg Exp $
 #
 # This Makefile fragment implements integration of pkgtools/cwrappers.
 
-BUILD_DEPENDS+=                cwrappers>=20141129:../../pkgtools/cwrappers
+BUILD_DEPENDS+=                cwrappers>=20150314:../../pkgtools/cwrappers
 
 # XXX This should be PREFIX, but USE_CROSSBASE overrides it.
 CWRAPPERS_SRC_DIR=     ${LOCALBASE}/libexec/cwrappers