| From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| Date: Tue, 21 May 2019 16:07:46 +0200 |
| Subject: [PATCH] Add meson option to pass sysroot |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| We need to pass this to meson to help it finding gdesktop-enums.h: |
| |
| | panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. |
| |
| Upstream-Status: Inappropriate [OE specific] |
| |
| Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| --- |
| meson_options.txt | 1 + |
| panels/background/meson.build | 2 +- |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/meson_options.txt b/meson_options.txt |
| index dbca723..af0f871 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('documentation', type: 'boolean', value: false, description: 'build documentation') |
| option('ibus', type: 'boolean', value: true, description: 'build with IBus support') |
| option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') |
| diff --git a/panels/background/meson.build b/panels/background/meson.build |
| index 3634c47..459ccfe 100644 |
| --- a/panels/background/meson.build |
| +++ b/panels/background/meson.build |
| @@ -25,7 +25,7 @@ common_sources = [] |
| |
| enums = 'gdesktop-enums-types' |
| enums_header = files( |
| - gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| + get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| 'cc-background-item.h' |
| ) |
| |
| -- |
| 2.34.1 |