From bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 12 Jun 2019 15:53:20 +0800 Subject: glib-2.0: fix configure error for meson build In glib 2.60.x, it turns selinux into a meson feature. We should use '-Dselinux=enabled/disabled' rather than '-Dselinux=true/false' to enable/disable the feature. Add meso-enable-selinux.bbclass for this change and inherit it in glib-2.0 bbappend to fix the configure error. Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- classes/meson-enable-selinux.bbclass | 4 ++++ recipes-core/glib-2.0/glib-2.0_%.bbappend | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 classes/meson-enable-selinux.bbclass diff --git a/classes/meson-enable-selinux.bbclass b/classes/meson-enable-selinux.bbclass new file mode 100644 index 0000000..91c2a2b --- /dev/null +++ b/classes/meson-enable-selinux.bbclass @@ -0,0 +1,4 @@ +inherit selinux + +PACKAGECONFIG_append = " ${@target_selinux(d)}" +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," diff --git a/recipes-core/glib-2.0/glib-2.0_%.bbappend b/recipes-core/glib-2.0/glib-2.0_%.bbappend index e5d2f6f..39a0a3a 100644 --- a/recipes-core/glib-2.0/glib-2.0_%.bbappend +++ b/recipes-core/glib-2.0/glib-2.0_%.bbappend @@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-enable-selinux', '', d)} -- cgit v1.2.3-54-g00ecf