| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Tue, 21 May 2019 16:07:46 +0200 |
| 4 | Subject: [PATCH] Add meson option to pass sysroot |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | We need to pass this to meson to help it finding gdesktop-enums.h: |
| 10 | |
| 11 | | panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. |
| 12 | |
| 13 | Upstream-Status: Inappropriate [OE specific] |
| 14 | |
| 15 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 16 | --- |
| 17 | meson_options.txt | 1 + |
| 18 | panels/background/meson.build | 2 +- |
| 19 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/meson_options.txt b/meson_options.txt |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 22 | index 8ee7b6e0e..7e6adc668 100644 |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 23 | --- a/meson_options.txt |
| 24 | +++ b/meson_options.txt |
| 25 | @@ -1,3 +1,4 @@ |
| 26 | +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 27 | option('documentation', type: 'boolean', value: false, description: 'build documentation') |
| Andrew Geissler | 89770b0 | 2020-06-13 10:40:47 -0500 | [diff] [blame] | 28 | option('ibus', type: 'boolean', value: true, description: 'build with IBus support') |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 29 | option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 30 | diff --git a/panels/background/meson.build b/panels/background/meson.build |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 31 | index 9bf543538..97f1e0117 100644 |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 32 | --- a/panels/background/meson.build |
| 33 | +++ b/panels/background/meson.build |
| Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 34 | @@ -19,7 +19,7 @@ common_sources = [] |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 35 | |
| 36 | enums = 'gdesktop-enums-types' |
| 37 | enums_header = files( |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 38 | - gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| 39 | + get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 40 | 'cc-background-item.h' |
| 41 | ) |
| 42 | |
| Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 43 | diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 44 | index 8cb3b63f0..8c5a45e7c 100644 |
| Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 45 | --- a/panels/datetime/meson.build |
| 46 | +++ b/panels/datetime/meson.build |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 47 | @@ -37,7 +37,7 @@ sources = files( |
| Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 48 | |
| 49 | enums = 'gdesktop-enums-types' |
| 50 | enums_header = files( |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 51 | - gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| 52 | + get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', |
| Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 53 | 'cc-datetime-panel.h' |
| 54 | ) |
| 55 | |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 56 | -- |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 57 | 2.34.1 |