diff options
| author | sbd <sbd> | 2012-09-16 07:49:11 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-09-16 07:49:11 +0000 |
| commit | 53cc2bc29e90a53ebdf375a4fe0801d1563d57d6 (patch) | |
| tree | 1636a8d39138dc96f95258b917e89173fb2e41f0 /mk/buildlink3 | |
| parent | 4eb23c818c82e20058e362d69babcb1009aeb3e5 (diff) | |
| download | pkgsrc-53cc2bc29e90a53ebdf375a4fe0801d1563d57d6.tar.gz | |
Add "BUILDLINK_AUTO_DIRS.<pkg>" control variable:
"yes" or "no" for whether BUILDLINK_{INCDIRS,LIBDIRS,RPATHDIRS}.<pkg>
should automatically be added to the compiler/linker search paths.
Defaults to "yes".
Diffstat (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 2c2515d3927..f9ad1980369 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.215 2012/09/16 07:37:10 sbd Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.216 2012/09/16 07:49:11 sbd Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -272,6 +272,11 @@ ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} # exist before they're added to the search # paths. # +# BUILDLINK_AUTO_DIRS.<pkg> "yes" or "no" for whether BUILDLINK_{INCDIRS, +# LIBDIRS,RPATHDIRS}.<pkg> should automatically +# be added to the compiler/linker search paths. +# Defaults to "yes". +# .for _pkg_ in ${_BLNK_PACKAGES} # # If we're using the built-in package, then provide sensible defaults. @@ -364,6 +369,7 @@ BUILDLINK_AUTO_VARS.${_pkg_}?= yes BUILDLINK_CPPFLAGS.${_pkg_}?= # empty BUILDLINK_LDFLAGS.${_pkg_}?= # empty BUILDLINK_LIBS.${_pkg_}?= # empty +BUILDLINK_AUTO_DIRS.${_pkg_}?= yes BUILDLINK_INCDIRS.${_pkg_}?= include BUILDLINK_LIBDIRS.${_pkg_}?= lib . if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull) @@ -408,6 +414,8 @@ BUILDLINK_LIBS+= ${_flag_} . endif . endfor . endif +. if defined(BUILDLINK_AUTO_DIRS.${_pkg_}) && \ + !empty(BUILDLINK_AUTO_DIRS.${_pkg_}:M[yY][eE][sS]) . if !empty(BUILDLINK_INCDIRS.${_pkg_}) . for _dir_ in ${BUILDLINK_INCDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//} . if exists(${_dir_}) @@ -435,6 +443,7 @@ BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_dir_} . endif . endfor . endif +. endif .endfor # # Add the depot directory library directory for this package to the |