blob: 11ad30eda64913a81c40f9fa317825a9b9dcded4 [file] [log] [blame]
Brad Bishope42b3e32020-01-15 22:08:42 -05001From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 21 May 2019 16:07:46 +0200
4Subject: [PATCH] Add meson option to pass sysroot
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9We 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
13Upstream-Status: Inappropriate [OE specific]
14
15Signed-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
21diff --git a/meson_options.txt b/meson_options.txt
Patrick Williams03907ee2022-05-01 06:28:52 -050022index dbca723..af0f871 100644
Brad Bishope42b3e32020-01-15 22:08:42 -050023--- 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 Bishope42b3e32020-01-15 22:08:42 -050027 option('documentation', type: 'boolean', value: false, description: 'build documentation')
Andrew Geissler89770b02020-06-13 10:40:47 -050028 option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
Patrick Williams03907ee2022-05-01 06:28:52 -050029 option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
Brad Bishope42b3e32020-01-15 22:08:42 -050030diff --git a/panels/background/meson.build b/panels/background/meson.build
Patrick Williams03907ee2022-05-01 06:28:52 -050031index 3634c47..459ccfe 100644
Brad Bishope42b3e32020-01-15 22:08:42 -050032--- a/panels/background/meson.build
33+++ b/panels/background/meson.build
Patrick Williams03907ee2022-05-01 06:28:52 -050034@@ -25,7 +25,7 @@ common_sources = []
Brad Bishope42b3e32020-01-15 22:08:42 -050035
36 enums = 'gdesktop-enums-types'
37 enums_header = files(
38- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
39+ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
40 'cc-background-item.h'
41 )
42
43--
Patrick Williams03907ee2022-05-01 06:28:52 -0500442.34.1