diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.29.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.8.bb | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 6305f553b4..3c2440db0e 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -41,8 +41,6 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'Tr | |||
41 | # meson's python configuration pokes into python3 configuration, so this provides the native config to it. | 41 | # meson's python configuration pokes into python3 configuration, so this provides the native config to it. |
42 | unset _PYTHON_SYSCONFIGDATA_NAME | 42 | unset _PYTHON_SYSCONFIGDATA_NAME |
43 | 43 | ||
44 | REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}" | ||
45 | |||
46 | S = "${WORKDIR}/glib-${PV}" | 44 | S = "${WORKDIR}/glib-${PV}" |
47 | 45 | ||
48 | PACKAGECONFIG ??= "system-pcre libmount" | 46 | PACKAGECONFIG ??= "system-pcre libmount" |
diff --git a/meta/recipes-core/glibc/glibc_2.29.bb b/meta/recipes-core/glibc/glibc_2.29.bb index beddbffee2..bd8aa6d503 100644 --- a/meta/recipes-core/glibc/glibc_2.29.bb +++ b/meta/recipes-core/glibc/glibc_2.29.bb | |||
@@ -89,12 +89,11 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
89 | --enable-stackguard-randomization \ | 89 | --enable-stackguard-randomization \ |
90 | --disable-crypt \ | 90 | --disable-crypt \ |
91 | --with-default-link \ | 91 | --with-default-link \ |
92 | --enable-nscd \ | ||
92 | ${GLIBCPIE} \ | 93 | ${GLIBCPIE} \ |
93 | ${GLIBC_EXTRA_OECONF}" | 94 | ${GLIBC_EXTRA_OECONF}" |
94 | 95 | ||
95 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 96 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |
96 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', '--enable-nscd', '--disable-nscd', d)}" | ||
97 | |||
98 | 97 | ||
99 | do_patch_append() { | 98 | do_patch_append() { |
100 | bb.build.exec_func('do_fix_readlib_c', d) | 99 | bb.build.exec_func('do_fix_readlib_c', d) |
diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 0e2461154b..62643bc764 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb | |||
@@ -42,8 +42,6 @@ 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 | |||
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)}" | 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)}" |
48 | 46 | ||
49 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 47 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |