Bug 191085
| Summary: | [patch] Mk/bsd.options.mk small fix for ${opt}_WITH if option is off | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Olli Hauer <ohauer> | ||||||
| Component: | Ports Framework | Assignee: | Olli Hauer <ohauer> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Many People | ||||||||
| Priority: | --- | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
Created attachment 143990 [details]
strip argument from ${opt}_WITH if opt is disabled
Approved, this will fix configure of a few ports when options are unset (math/asymptote, lang/smalltalk, net-im/freetalk) Could you update section 5.12.3.4 of the porters handbook too? Created attachment 143994 [details]
${opt}_with handbook fix
I think this is the easiest way to document the patch.
A commit references this bug: Author: ohauer Date: Sat Jun 21 13:29:31 UTC 2014 New revision: 358699 URL: http://svnweb.freebsd.org/changeset/ports/358699 Log: - strip optional WITH parameter from argument if OPTION is set to off FOO_WITH= foo=bar CONFIGURE_ARGS will become now ON: --with-foo=bar OFF: --without-foo PR: 191085 Submitted by: ohauer Approved by: portmgr (antoine) Changes: head/Mk/bsd.options.mk DOCS PR 191243 was opened to reflect this patch. |
The ${opt}_WITH construct is not usable in case the option has additional parameters like paths E.g dns/powerdns uses: PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql For testing change the four lines to the following two PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE} MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} Then test with make -V CONFIGURE_ARGS WITHOUT=PGSQL -C dns/powerdns ... --without-pgsql=/usr/local -> ${LOCALBASE} is not stripped With the patch below it works as expected and many Makefiles can be simplified make -V CONFIGURE_ARGS WITHOUT=PGSQL -C dns/powerdns ... --without-pgsql Index: /usr/ports/Mk/bsd.options.mk =================================================================== --- /usr/ports/Mk/bsd.options.mk (revision 357956) +++ /usr/ports/Mk/bsd.options.mk (working copy) @@ -470,7 +470,7 @@ . endif . if defined(${opt}_CONFIGURE_WITH) . for iopt in ${${opt}_CONFIGURE_WITH} -CONFIGURE_ARGS+= --without-${iopt} +CONFIGURE_ARGS+= --without-${iopt:C/=.*//} . endfor . endif . for configure in CONFIGURE CMAKE QMAKE