diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2019-06-12 15:53:20 +0800 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2019-06-15 23:11:05 -0400 |
| commit | bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0 (patch) | |
| tree | 569f26bb16eacdabe860e7b60063e06dee077d5f | |
| parent | 8b7a9638c5a920cf0d9f5d1e64da49495f9aacf9 (diff) | |
| download | meta-selinux-bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0.tar.gz | |
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 <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
| -rw-r--r-- | classes/meson-enable-selinux.bbclass | 4 | ||||
| -rw-r--r-- | recipes-core/glib-2.0/glib-2.0_%.bbappend | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ | |||
| 1 | inherit selinux | ||
| 2 | |||
| 3 | PACKAGECONFIG_append = " ${@target_selinux(d)}" | ||
| 4 | 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)} | ||