commit 397e6bcb5e30fb2e0fb46b75138d3883558888b3
author Patrick Williams <patrick@stwcx.xyz> Wed Nov 29 06:44:45 2023 -0600
committer Patrick Williams <patrick@stwcx.xyz> Thu Nov 30 03:40:02 2023 +0000
tree 365d37d66c45c194f64d19c245a4781125ce191c
parent 3f0f7bc35831d467d912698dc5dbd9dcf9ad10f3

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: I816b3334e4bb65384a49bc34af6ae5fe092c923e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

meson.build

diff --git a/meson.build b/meson.build
index 943cd37..c8f0c31 100644
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,7 @@
     configuration: conf_data
 )
 
-if get_option('oe-sdk').enabled()
+if get_option('oe-sdk').allowed()
     OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
     if OECORE_TARGET_SYSROOT == ''
         error('OECORE_TARGET_SYSROOT must be set with enable oe-sdk')

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index 2513278..50f71a3 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -80,7 +80,7 @@
                            swampd_sources,
                        ],
                        link_args: dynamic_linker,
-                       build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+                       build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
                        dependencies: [
                            gtest,
                            gmock,