diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.8.bb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index e8215da583..a868b6df23 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -29,7 +29,9 @@ PACKAGES += "${PN}-codegen ${PN}-utils" | |||
29 | 29 | ||
30 | LEAD_SONAME = "libglib-2.0.*" | 30 | LEAD_SONAME = "libglib-2.0.*" |
31 | 31 | ||
32 | inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages | 32 | inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check |
33 | |||
34 | REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}" | ||
33 | 35 | ||
34 | S = "${WORKDIR}/glib-${PV}" | 36 | S = "${WORKDIR}/glib-${PV}" |
35 | 37 | ||
diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 740bf56a5a..0e2461154b 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb | |||
@@ -38,10 +38,12 @@ PACKAGECONFIG ??= "python \ | |||
38 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" | 38 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" |
39 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 39 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
40 | 40 | ||
41 | inherit autotools pkgconfig binconfig-disabled ptest | 41 | inherit autotools pkgconfig binconfig-disabled ptest distro_features_check |
42 | 42 | ||
43 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | 43 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} |
44 | 44 | ||
45 | REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}" | ||
46 | |||
45 | RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" | 47 | RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" |
46 | 48 | ||
47 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 49 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |