| From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 |
| From: Markus Volk <f_l_k@t-online.de> |
| Date: Mon, 18 Mar 2024 05:50:21 +0100 |
| Subject: [PATCH] Add meson option to pass sysroot |
| |
| Signed-off-by: Markus Volk <f_l_k@t-online.de> |
| |
| Upstream-Status: Inappropriate [OE specific] |
| --- |
| meson_options.txt | 1 + |
| panels/background/meson.build | 2 +- |
| panels/system/meson.build | 2 +- |
| 3 files changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/meson_options.txt b/meson_options.txt |
| index e53d6e3f3..8fae4c824 100644 |
| --- a/meson_options.txt |
| +++ b/meson_options.txt |
| @@ -1,3 +1,4 @@ |
| +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') |
| option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') |
| option('documentation', type: 'boolean', value: false, description: 'build documentation') |
| option('ibus', type: 'boolean', value: true, description: 'build with IBus support') |
| diff --git a/panels/background/meson.build b/panels/background/meson.build |
| index 6ced050f9..df1f80896 100644 |
| --- a/panels/background/meson.build |
| +++ b/panels/background/meson.build |
| @@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( |
| |
| enums = 'gdesktop-enums-types' |
| enums_header = files( |
| - gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h' |
| + get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h' |
| ) |
| |
| common_sources += gnome.mkenums( |
| diff --git a/panels/system/meson.build b/panels/system/meson.build |
| index 4fee82210..979332a0e 100644 |
| --- a/panels/system/meson.build |
| +++ b/panels/system/meson.build |
| @@ -73,7 +73,7 @@ sources += gnome.compile_resources( |
| ) |
| |
| enums_header = files( |
| - gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| + get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| 'datetime/cc-datetime-page.h' |
| ) |
| |
| -- |
| 2.44.0 |
| |