diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-16 02:45:45 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-18 06:31:53 +0100 |
| commit | cab86a3196ef4fcd2714591597f2503aa8138df0 (patch) | |
| tree | 67f775b2d72b29260c1eddb54721413ca10892dd /meta/recipes-support/pinentry | |
| parent | 08c86406186828dce19e101adfd118ed5d9e947e (diff) | |
| download | openembedded-core-contrib-cab86a3196ef4fcd2714591597f2503aa8138df0.tar.gz | |
webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled
* gobject-introspection is mandatory since libsecret upgrade to 0.20.3
* enable libsecret in webkitgtk only when gobject-introspection-data
is in DISTRO_FEATURES
* drop comment about libsecret being in meta-gnome from pinentry
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/pinentry')
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry_1.1.0.bb | 6 |
1 files changed, 3 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 8c500dcadc..dc9069b9d5 100644 --- a/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb @@ -19,7 +19,9 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" -inherit autotools pkgconfig +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}" PACKAGECONFIG ??= "ncurses libcap" @@ -27,8 +29,6 @@ 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" - -#To use libsecret, add meta-gnome PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \ |