diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2020-05-22 15:00:23 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-24 23:55:31 +0100 |
| commit | 424b65d57b16e3f0ad29a5115f048aaba4d95473 (patch) | |
| tree | f6476e92973980e53d132bd1ae9dbb44fd13bbb8 /meta/recipes-sato | |
| parent | 019dd3afb8b49dc268bd7fb122a236b730ed67db (diff) | |
| download | openembedded-core-contrib-424b65d57b16e3f0ad29a5115f048aaba4d95473.tar.gz | |
Revert "webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled"
This reverts commit 91264e5e0ab40b796e214edd84c72bc88b363778.
It adds meson options 'instrospection' to disable gobject introspection
files build. So no need to check distro feature 'gobject-introspection-data'
any longer.
Keep the spaces adjustment and comment removal.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb index 51596077b4..e9941c7a2c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb @@ -26,9 +26,7 @@ SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc6 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)} \ -" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -44,7 +42,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ enchant \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'libsecret', '', d)} \ + libsecret \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" |