On Mon, Jul 27, 2020 at 6:14 AM Andreas Müller <[email protected]> wrote:
> If I am not mistaken, the patch > "meson.bbclass: avoid unexpected operating-system names" > made it into dunfell so this patch does not change anything (it should > do no harm either) You are correct! I didn't parse the commit message properly when I took this patch. I'll drop this patch from the final pull request. Thanks for reviewing it, I really appreciate your help! Steve > Andreas > > 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. > > > > Signed-off-by: Ahmad Fatoum <[email protected]> > > Signed-off-by: Steve Sakoman <[email protected]> > > --- > > ...ot-hardcode-linux-as-the-host-system.patch | 49 +++++++++++++++++++ > > meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | 1 + > > 2 files changed, 50 insertions(+) > > create mode 100644 > > meta/recipes-core/glib-2.0/glib-2.0/0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch > > > > 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..616bbd8a7d > > --- /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 @@ > > +From a300a09661124451d4783d4be66e3993262dc9be Mon Sep 17 00:00:00 2001 > > +From: Ahmad Fatoum <[email protected]> > > +Date: Thu, 9 Jul 2020 13:00:16 +0200 > > +Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system > > + > > +OE build system can set this to other values that include 'linux', > > +e.g. 'linux-gnueabi'. This led to glib always being built without > > +libmount, mkostemp and selinux support. > > + > > +Upstream-Status: Inappropriate [other] > > +Signed-off-by: Ahmad Fatoum <[email protected]> > > +--- > > + meson.build | 6 +++--- > > + 1 file changed, 3 insertions(+), 3 deletions(-) > > + > > +diff --git a/meson.build b/meson.build > > +index 3a47a7cc4b98..af09dfc853e5 100644 > > +--- a/meson.build > > ++++ b/meson.build > > +@@ -632,7 +632,7 @@ else > > + endif > > + message('Checking whether to use statfs or statvfs .. ' + > > stat_func_to_use) > > + > > +-if host_system == 'linux' > > ++if host_system.contains('linux') > > + if cc.has_function('mkostemp', > > + prefix: '''#define _GNU_SOURCE > > + #include <stdlib.h>''') > > +@@ -1857,7 +1857,7 @@ glib_conf.set_quoted('GLIB_LOCALE_DIR', > > join_paths(glib_datadir, 'locale')) > > + # libmount is only used by gio, but we need to fetch the libs to generate > > the > > + # pkg-config file below > > + libmount_dep = [] > > +-if host_system == 'linux' and get_option('libmount') > > ++if host_system.contains('linux') and get_option('libmount') > > + libmount_dep = [dependency('mount', version : '>=2.23', required : > > true)] > > + glib_conf.set('HAVE_LIBMOUNT', 1) > > + endif > > +@@ -1867,7 +1867,7 @@ if host_system == 'windows' > > + endif > > + > > + selinux_dep = [] > > +-if host_system == 'linux' > > ++if host_system.contains('linux') > > + selinux_dep = dependency('libselinux', required: get_option('selinux')) > > + > > + glib_conf.set('HAVE_SELINUX', selinux_dep.found()) > > +-- > > +2.27.0 > > + > > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb > > b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb > > index d496235003..fd7f5ee920 100644 > > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb > > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb > > @@ -19,6 +19,7 @@ SRC_URI = > > "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ > > > > file://0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch \ > > > > file://0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch \ > > > > file://0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch \ > > + > > file://0020-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ > > " > > > > SRC_URI_append_class-native = " file://relocate-modules.patch" > > -- > > 2.17.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141008): https://lists.openembedded.org/g/openembedded-core/message/141008 Mute This Topic: https://lists.openembedded.org/mt/75824515/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
