From 5acf5534513105509e1385a8bb31bdc03a08555f Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 20 Jul 2020 12:30:11 +0200 Subject: core: glib-2.0: fix requested libmount/mkostemp/selinux not being linked in Since 010202076760 ("meson.bbclass: avoid unexpected operating-system names"), meson is no longer used with a cross file that appends the used libc to the operating system name, e.g. linux-gnueabi. Prior to that commit, the host_system == 'linux' checks in glib's meson failed, which led to glib being compiled without libmount, mkostemp and selinux even if explicitly requested. As the aforementioned commit affects all recipes built by glib, it might not be a candidate for backporting to current stable branches. To fix just the glib issue, instances of host_system == 'linux' are patched locally. The patch is marked as Upstream-Status: Inappropriate as it is rendered unnecessary for OE releases newer than Dunfell. (From OE-Core rev: 2adcc5ade62fe10715a6c943565f71efe7627229) Signed-off-by: Ahmad Fatoum Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb') 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 \ file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ file://CVE-2020-6750.patch \ + file://0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -- cgit v1.2.3-54-g00ecf