commit 7619ab783e9dddf4d8602022889e2ae8641f23db
author Patrick Williams <patrick@stwcx.xyz> Wed Nov 29 06:44:58 2023 -0600
committer Zane Shelley <zshelle@us.ibm.com> Thu Nov 30 20:17:38 2023 +0000
tree e81ce36c1821806b8d96925e6385ced14b1250b1
parent 3907c7a739710aa94749431a9de8451d7b56e186

build: use allowed over enabled

Meson feature options are typically in a tri-state of enabled, disabled,
or auto.  The enabled and disabled functions on an option (from
`get_option`) no longer return true for auto features.  Instead, the
expectation is to use `allowed()` which is true for both enabled and auto.

Switch all uses of `enabled` to `allowed`.

Change-Id: I2253ebff36b49c4b79b803175dd76668f8ac2ba8
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

attn/meson.build

diff --git a/attn/meson.build b/attn/meson.build
index 5a2834b..b1f0d9e 100644
--- a/attn/meson.build
+++ b/attn/meson.build
@@ -10,7 +10,7 @@
 attn_conf = configuration_data()
 
 # conditionally define ENABLE_PHAL_TRUE
-if (get_option('phal').enabled())
+if (get_option('phal').allowed())
     attn_conf.set('ENABLE_PHAL_TRUE', '')
 else
     attn_conf.set('ENABLE_PHAL_TRUE', '#')
@@ -71,7 +71,7 @@
 ]
 
 # conditional library dependencies
-if get_option('phal').enabled()
+if get_option('phal').allowed()
   attn_deps += libphal_dep
 endif
 

meson.build

diff --git a/meson.build b/meson.build
index ff1b127..d2f59d8 100644
--- a/meson.build
+++ b/meson.build
@@ -36,7 +36,7 @@
 
 conf = configuration_data()
 
-conf.set('CONFIG_PHAL_API', get_option('phal').enabled())
+conf.set('CONFIG_PHAL_API', get_option('phal').allowed())
 
 configure_file(input: 'config.h.in', output: 'config.h', configuration: conf)
 
@@ -66,7 +66,7 @@
 
 fmt_dep = dependency('fmt')
 
-if get_option('phal').enabled()
+if get_option('phal').allowed()
   libphal_dep = cmplr.find_library('phal')
 endif
 

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index 273087f..c9f0414 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -15,7 +15,7 @@
         )
         gmock_dep = gtest_proj.dependency('gmock')
     else
-        assert(not get_option('tests').enabled(),
+        assert(not get_option('tests').allowed(),
                'Googletest is required if tests are enabled')
     endif
 endif

util/meson.build

diff --git a/util/meson.build b/util/meson.build
index 4b107d8..3797e5c 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -18,7 +18,7 @@
     phosphor_logging_dep,
 ]
 
-if get_option('phal').enabled()
+if get_option('phal').allowed()
     util_deps += dependency('libdt-api')
 endif