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-support | |
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-support')
-rw-r--r-- | meta/recipes-support/pinentry/pinentry_1.1.0.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/meta/recipes-support/pinentry/pinentry_1.1.0.bb index dc9069b9d5..d9ca0732f7 100644 --- a/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb @@ -19,9 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" -inherit autotools pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}" +inherit autotools pkgconfig PACKAGECONFIG ??= "ncurses libcap" @@ -29,6 +27,7 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" + PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \ |