Date: Mon, 17 Apr 2017 20:24:46 +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: r438752 - head/Mk Message-ID: <201704172024.v3HKOkYd094457@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Mon Apr 17 20:24:46 2017 New Revision: 438752 URL: https://svnweb.freebsd.org/changeset/ports/438752 Log: * Fix MESON_TRUE/MESON_FALSE comment, to mention the actualy meson argument. * Rework option hanlding to be more clear and to avoid double negative. Submitted by: antoine@ Approved by: antoine@ Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Apr 17 20:20:22 2017 (r438751) +++ head/Mk/bsd.options.mk Mon Apr 17 20:24:46 2017 (r438752) @@ -118,11 +118,11 @@ # content to MESON_ARGS. # # ${opt}_MESON_TRUE Will add to MESON_ARGS: -# Option enabled --${content} true -# Option disabled --${content} false +# Option enabled -D${content}=true +# Option disabled -D${content}=false # ${opt}_MESON_FALSE Will add to MESON_ARGS: -# Option enabled --${content} false -# Option disabled --${content} true +# Option enabled -D${content}=false +# Option disabled -D${content}=true # # ${opt}_IMPLIES When opt is enabled, options named in IMPLIES will # get enabled too. @@ -536,8 +536,8 @@ CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/ . if defined(${opt}_MESON_TRUE) MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=true/} . endif -. if defined(${opt}_MESON_TRUE_OFF) -MESON_ARGS+= ${${opt}_MESON_TRUE_OFF:C/.*/-D&=false/} +. if defined(${opt}_MESON_FALSE) +MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} . endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_ON) @@ -589,11 +589,11 @@ CMAKE_ARGS+= ${${opt}_CMAKE_BOOL:C/.*/- . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/} . endif -. if defined(${opt}_MESON_FALSE) -MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} +. if defined(${opt}_MESON_TRUE) +MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=false/} . endif -. if defined(${opt}_MESON_FALSE_OFF) -MESON_ARGS+= ${${opt}_MESON_FALSE_OFF:C/.*/-D&=true/} +. if defined(${opt}_MESON_FALSE) +MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=true/} . 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?201704172024.v3HKOkYd094457>