Date: Sun, 27 Oct 2013 11:58:20 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331760 - head/Mk Message-ID: <201310271158.r9RBwKDr045394@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sun Oct 27 11:58:20 2013 New Revision: 331760 URL: http://svnweb.freebsd.org/changeset/ports/331760 Log: Allow multiple values for configure ENABLE and WITH options helpers ${opt}_CONFIGURE_ENABLE and ${opt}_CONFIGURE_WITH now accept multiple arguments and will be expanded accordingly, e.g.: OPT_CONFIGURE_ENABLE= feature1 feature2 -- will add to CONFIGURE_ARGS: OPT enabled: --enable-feature1 --enable-feature2 OPT disabled: --disable-feature1 --disable-feature2 Approved by: portmgr (bapt) Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Sun Oct 27 11:50:24 2013 (r331759) +++ head/Mk/bsd.options.mk Sun Oct 27 11:58:20 2013 (r331760) @@ -391,10 +391,14 @@ USE_${_u:U}+= ${option:C/.*=//g} . endfor . endif . if defined(${opt}_CONFIGURE_ENABLE) -CONFIGURE_ARGS+= --enable-${${opt}_CONFIGURE_ENABLE} +. for iopt in ${${opt}_CONFIGURE_ENABLE} +CONFIGURE_ARGS+= --enable-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_WITH) -CONFIGURE_ARGS+= --with-${${opt}_CONFIGURE_WITH} +. for iopt in ${${opt}_CONFIGURE_WITH} +CONFIGURE_ARGS+= --with-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_ON) CONFIGURE_ARGS+= ${${opt}_CONFIGURE_ON} @@ -416,10 +420,14 @@ ${deptype}_DEPENDS+= ${${opt}_${deptype} . endfor . else . if defined(${opt}_CONFIGURE_ENABLE) -CONFIGURE_ARGS+= --disable-${${opt}_CONFIGURE_ENABLE} +. for iopt in ${${opt}_CONFIGURE_ENABLE} +CONFIGURE_ARGS+= --disable-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_WITH) -CONFIGURE_ARGS+= --without-${${opt}_CONFIGURE_WITH} +. for iopt in ${${opt}_CONFIGURE_WITH} +CONFIGURE_ARGS+= --without-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_OFF) CONFIGURE_ARGS+= ${${opt}_CONFIGURE_OFF}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310271158.r9RBwKDr045394>