aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwg <wg@FreeBSD.org>2013-10-27 19:58:20 +0800
committerwg <wg@FreeBSD.org>2013-10-27 19:58:20 +0800
commit19849e3c38835b0c322659db1f17055baaf7e017 (patch)
tree96481a5c4991a170778cfda018d193ed29b4b256
parentb632695844c5ef66a609eed922773d1e092c4153 (diff)
downloadfreebsd-ports-gnome-19849e3c38835b0c322659db1f17055baaf7e017.tar.gz
freebsd-ports-gnome-19849e3c38835b0c322659db1f17055baaf7e017.tar.zst
freebsd-ports-gnome-19849e3c38835b0c322659db1f17055baaf7e017.zip
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)
-rw-r--r--Mk/bsd.options.mk16
1 files changed, 12 insertions, 4 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 348f35f5bee0..001b8220865b 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -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}_DEPENDS}
. 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}