diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-16 22:36:44 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-16 22:36:44 +0000 |
| commit | 45b04c6514df37672a40b7053abaf48c0c838ff5 (patch) | |
| tree | dc0af402f654cc162c50da818cce7df7b8fc7195 /Mk/bsd.port.mk | |
| parent | d9577c15b6ad21e9d59ad1be14711532e40cc918 (diff) | |
| download | ports-45b04c6514df37672a40b7053abaf48c0c838ff5.tar.gz ports-45b04c6514df37672a40b7053abaf48c0c838ff5.zip | |
compare options loading from /var/db/port/options and make.conf against the
complete list of options.
COMPLETE_OPTIONS_LIST being OPTIONS_DEFINE + all the OPTIONS_SINGLE_* + all the
OPTIONS_MULTI_*
Notes
Notes:
svn path=/head/; revision=300983
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b267a21b2752..e0e8c69bc100 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6004,7 +6004,6 @@ sanity-config: _check-config .if !target(pre-config) pre-config: -_COMPLETE_OPTIONS_LIST:= ${ALL_OPTIONS} .for opt in ${ALL_OPTIONS} . if empty(PORT_OPTIONS:M${opt}) DEFOPTIONS+= ${opt} ""${${opt}_DESC:Q} off @@ -6014,7 +6013,6 @@ DEFOPTIONS+= ${opt} ""${${opt}_DESC:Q} on .endfor .for multi in ${OPTIONS_MULTI} . for opt in ${OPTIONS_MULTI_${multi}} -_COMPLETE_OPTIONS_LIST+= ${opt} . if empty(PORT_OPTIONS:M${opt}) DEFOPTIONS+= ${opt} "M(${multi}): "${${opt}_DESC:Q} off . else @@ -6024,7 +6022,6 @@ DEFOPTIONS+= ${opt} "M(${multi}): "${${opt}_DESC:Q} on .endfor .for single in ${OPTIONS_SINGLE} . for opt in ${OPTIONS_SINGLE_${single}} -_COMPLETE_OPTIONS_LIST+= ${opt} . if empty(PORT_OPTIONS:M${opt}) DEFOPTIONS+= ${opt} "S(${single}): "${${opt}_DESC:Q} off . else @@ -6032,8 +6029,6 @@ DEFOPTIONS+= ${opt} "S(${single}): "${${opt}_DESC:Q} on . endif . endfor .endfor - -_COMPLETE_OPTIONS_LIST:= ${_COMPLETE_OPTIONS_LIST:u} .undef multi .undef single .undef opt @@ -6073,8 +6068,8 @@ config: pre-config ${ECHO_CMD} "# This file is auto-generated by 'make config'." > $${TMPOPTIONSFILE}; \ ${ECHO_CMD} "# Options for ${PKGNAME}" >> $${TMPOPTIONSFILE}; \ ${ECHO_CMD} "_OPTIONS_READ=${PKGNAME}" >> $${TMPOPTIONSFILE}; \ - ${ECHO_CMD} "_FILE_COMPLETE_OPTIONS_LIST=${_COMPLETE_OPTIONS_LIST}" >> $${TMPOPTIONSFILE}; \ - for i in ${_COMPLETE_OPTIONS_LIST}; do \ + ${ECHO_CMD} "_FILE_COMPLETE_OPTIONS_LIST=${COMPLETE_OPTIONS_LIST}" >> $${TMPOPTIONSFILE}; \ + for i in ${COMPLETE_OPTIONS_LIST}; do \ if ${ECHO_CMD} $${SELOPTIONS} | ${GREP} -qw $${i}; then \ ${ECHO_CMD} "OPTIONS_FILE_SET+=$${i}" >> $${TMPOPTIONSFILE}; \ else \ |