diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-03-23 11:50:01 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-03-23 11:50:01 +0000 |
| commit | 069bbc4b5fb549ad7c03542ade5ceb8e84021dbd (patch) | |
| tree | 22eb6f81c058b5daf1b54757d16b85e4576702f2 /mk | |
| parent | e2110e84ad6f16c0fcf87a1aff4b3466a13352f6 (diff) | |
| download | pkgsrc-069bbc4b5fb549ad7c03542ade5ceb8e84021dbd.tar.gz | |
Move handling for PKG_SUPPORTED_OPTIONS and PKG_SUGGESTED_OPTIONS as
OPSYSVARS to bsd.options.mk as they affect tests against PKG_OPTIONS
before bsd.pkg.mk is parsed.
Approved for commit during the freeze by agc@.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.options.mk | 12 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index be9552f9440..b6f6571d64c 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.71 2013/06/07 00:41:39 obache Exp $ +# $NetBSD: bsd.options.mk,v 1.72 2016/03/23 11:50:01 jperkin Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -178,6 +178,16 @@ PKG_SUPPORTED_OPTIONS?= # none PKG_FAIL_REASON+= "[bsd.options.mk] The package has no options, but includes this file." .endif +# Handle OPSYSVARS here for package options as we need to test PKG_OPTIONS +# in options.mk and cannot wait for lazy evaluation from bsd.pkg.mk. +.for _var_ in PKG_SUPPORTED_OPTIONS PKG_SUGGESTED_OPTIONS +. if defined(${_var_}.${OPSYS}) +${_var_}+= ${${_var_}.${OPSYS}} +. elif defined(${_var_}.*) +${_var_}+= ${${_var_}.*} +. endif +.endfor + # # create map of option to group and add group options to PKG_SUPPORTED_OPTIONS # diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 89458c80482..5d18d980e46 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2017 2016/02/26 11:38:37 jperkin Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2018 2016/03/23 11:50:01 jperkin Exp $ # # This file is in the public domain. # @@ -142,7 +142,6 @@ OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OPSYSVARS+= CMAKE_ARGS CONFIGURE_ARGS CONFIGURE_ENV OPSYSVARS+= BUILDLINK_TRANSFORM SUBST_CLASSES OPSYSVARS+= BUILD_TARGET MAKE_ENV MAKE_FLAGS USE_TOOLS -OPSYSVARS+= PKG_SUPPORTED_OPTIONS PKG_SUGGESTED_OPTIONS .for _var_ in ${OPSYSVARS:O} . if defined(${_var_}.${OPSYS}) ${_var_}+= ${${_var_}.${OPSYS}} |