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:33:36 +0100 |
commit | 91264e5e0ab40b796e214edd84c72bc88b363778 (patch) | |
tree | bef7eef8a8c93e84d204d6e33dcfc0ea7b320419 /meta/recipes-support | |
parent | e8ac4332b8d8f5660c80e6832aed62afefbecab4 (diff) | |
download | poky-91264e5e0ab40b796e214edd84c72bc88b363778.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
(From OE-Core rev: cab86a3196ef4fcd2714591597f2503aa8138df0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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 | 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 \ | |||
19 | SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" | 19 | SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" |
20 | SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" | 20 | SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" |
21 | 21 | ||
22 | inherit autotools pkgconfig | 22 | inherit autotools pkgconfig features_check |
23 | |||
24 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}" | ||
23 | 25 | ||
24 | PACKAGECONFIG ??= "ncurses libcap" | 26 | PACKAGECONFIG ??= "ncurses libcap" |
25 | 27 | ||
@@ -27,8 +29,6 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING | |||
27 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" | 29 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" |
28 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" | 30 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" |
29 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" | 31 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" |
30 | |||
31 | #To use libsecret, add meta-gnome | ||
32 | PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" | 32 | PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" |
33 | 33 | ||
34 | EXTRA_OECONF = " \ | 34 | EXTRA_OECONF = " \ |