Date: Fri, 9 Jun 2017 18:12:54 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443024 - head/Mk Message-ID: <201706091812.v59ICsso011792@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Jun 9 18:12:54 2017 New Revision: 443024 URL: https://svnweb.freebsd.org/changeset/ports/443024 Log: Meson is picky about the arguments of build options. For example a option of the "boolean" type only accepts true/false this option is covered by ${opt}_MESON_TRUE/_FALSE. Add option helpers ${opt}_MESON_YES/_NO for the "combo" type which accepts yes and no. Approved by: portmgr@ (mat@) Differential Revision: https://reviews.freebsd.org/D11078 Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Fri Jun 9 17:41:19 2017 (r443023) +++ head/Mk/bsd.options.mk Fri Jun 9 18:12:54 2017 (r443024) @@ -124,6 +124,13 @@ # Option enabled -D${content}=false # Option disabled -D${content}=true # +# ${opt}_MESON_YES Will add to MESON_ARGS: +# Option enabled -D${content}=yes +# Option disabled -D${content}=no +# ${opt}_MESON_NO Will add to MESON_ARGS: +# Option enabled -D${content}=no +# Option disabled -D${content}=yes +# # ${opt}_IMPLIES When opt is enabled, options named in IMPLIES will # get enabled too. # ${opt}_PREVENTS When opt is enabled, if any options in PREVENTS are @@ -539,6 +546,12 @@ MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=true/} . if defined(${opt}_MESON_FALSE) MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} . endif +. if defined(${opt}_MESON_YES) +MESON_ARGS+= ${${opt}_MESON_YES:C/.*/-D&=yes/} +. endif +. if defined(${opt}_MESON_NO) +MESON_ARGS+= ${${opt}_MESON_NO:C/.*/-D&=no/} +. endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_ON) ${configure}_ARGS+= ${${opt}_${configure}_ON} @@ -594,6 +607,12 @@ MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=false/} . endif . if defined(${opt}_MESON_FALSE) MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=true/} +. endif +. if defined(${opt}_MESON_YES) +MESON_ARGS+= ${${opt}_MESON_YES:C/.*/-D&=no/} +. endif +. if defined(${opt}_MESON_NO) +MESON_ARGS+= ${${opt}_MESON_NO:C/.*/-D&=yes/} . endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_OFF)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706091812.v59ICsso011792>