summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch49
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb1
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-2.0/glib-2.0/0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch
new file mode 100644
index 0000000000..9c311f1c90
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch
@@ -0,0 +1,49 @@
1From d5e82cd0b6076f33b86e0285ef1c0dba8a14112e Mon Sep 17 00:00:00 2001
2From: Ahmad Fatoum <a.fatoum@pengutronix.de>
3Date: Thu, 9 Jul 2020 13:00:16 +0200
4Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
5
6OE build system can set this to other values that include 'linux',
7e.g. 'linux-gnueabi'. This led to glib always being built without
8libmount, mkostemp and selinux support.
9
10Upstream-Status: Inappropriate [other]
11Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
12---
13 meson.build | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/meson.build b/meson.build
17index dd95c750b5ea..8bcacaf3c7e1 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -604,7 +604,7 @@ else
21 endif
22 message('Checking whether to use statfs or statvfs .. ' + stat_func_to_use)
23
24-if host_system == 'linux'
25+if host_system.contains('linux')
26 if cc.has_function('mkostemp',
27 prefix: '''#define _GNU_SOURCE
28 #include <stdlib.h>''')
29@@ -1810,7 +1810,7 @@ glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale'))
30 # libmount is only used by gio, but we need to fetch the libs to generate the
31 # pkg-config file below
32 libmount_dep = []
33-if host_system == 'linux' and get_option('libmount')
34+if host_system.contains('linux') and get_option('libmount')
35 libmount_dep = [dependency('mount', version : '>=2.23', required : true)]
36 glib_conf.set('HAVE_LIBMOUNT', 1)
37 endif
38@@ -1820,7 +1820,7 @@ if host_system == 'windows'
39 endif
40
41 selinux_dep = []
42-if host_system == 'linux'
43+if host_system.contains('linux')
44 selinux_dep = dependency('libselinux', required: get_option('selinux'))
45
46 glib_conf.set('HAVE_SELINUX', selinux_dep.found())
47--
482.27.0
49
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
index 5be81a8f31..af8ded76d5 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
17 file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ 17 file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
18 file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ 18 file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
19 file://CVE-2020-6750.patch \ 19 file://CVE-2020-6750.patch \
20 file://0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
20 " 21 "
21 22
22SRC_URI_append_class-native = " file://relocate-modules.patch" 23SRC_URI_append_class-native = " file://relocate-modules.patch"