commit a8ebf9622562caf3d6ea74edfad42cfed4171999
author Patrick Williams <patrick@stwcx.xyz> Thu Nov 17 06:57:35 2022 -0600
committer Patrick Williams <patrick@stwcx.xyz> Thu Nov 17 07:09:32 2022 -0600
tree a82ddbcdb9bcef51428902afc391d203929b3d8d
parent deb86b4a16b0a4cb7b83420f7f4b864db3ae2717

meson: remove oe-sdk support

Very few of our projects have this extra code and it doesn't seem
very useful considering we have both meson-subproject support and
developers can use devtool.

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

meson.build

diff --git a/meson.build b/meson.build
index 0dca8c0..0bca0cf 100644
--- a/meson.build
+++ b/meson.build
@@ -306,21 +306,6 @@
 # need to define and build the tests from here
 build_tests = get_option('tests')
 if not build_tests.disabled()
-    oe_sdk = get_option('oe-sdk')
-    if oe_sdk.enabled()
-        # Setup OE SYSROOT
-        OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
-        if OECORE_TARGET_SYSROOT == ''
-            error('Unable to get $OECORE_TARGET_SYSROOT, check your environment.')
-        endif
-        message('OE_SYSROOT: ' + OECORE_TARGET_SYSROOT)
-        rpath = ':'.join([OECORE_TARGET_SYSROOT + '/lib', OECORE_TARGET_SYSROOT + '/usr/lib'])
-        ld_so = run_command('sh', '-c', 'find ' + OECORE_TARGET_SYSROOT + '/lib/ld-*.so | sort -r -n | head -n1').stdout().strip()
-        dynamic_linker = ['-Wl,-dynamic-linker,' + ld_so]
-    else
-        dynamic_linker = []
-    endif
-
     gtest = dependency('gtest', main: true, disabler: true, required: build_tests)
     include_srcs = declare_dependency(sources: [
         'utils.cpp',
@@ -333,8 +318,6 @@
         executable(
             'utest',
             './test/utest.cpp',
-            link_args: dynamic_linker,
-            build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
             dependencies: [deps, gtest, include_srcs, ssl]
         )
 )

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index e9eecff..a356b5b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,8 +17,6 @@
 
 option('tests', type: 'feature', description: 'Build tests')
 
-option('oe-sdk', type: 'feature', description: 'Enable OE SDK')
-
 option('verify-signature', type: 'feature', value: 'enabled',
     description: 'LEGACY: Use verify-full-signature instead. Enable image signature validation.')
 

test/README.md

diff --git a/test/README.md b/test/README.md
index b69b84f..6c3ad4e 100755
--- a/test/README.md
+++ b/test/README.md
@@ -6,7 +6,7 @@
 - Run the following commands:
 
   ```
-  meson -Doe-sdk=enabled -Dtests=enabled build
+  meson -Dtests=enabled build
   ninja -C build test
   ```