mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

packages: respect PACKAGE_NO_GCONV

Browse Source 
PACKAGE_NO_GCONV is set in libc-package.bbclass if not all of
'libc-charsets libc-locale-code libc-locales' included in
DISTRO_FEATURES. And then no packages glibc-gconv-* glibc-charmap-* and
glibc-localedata-* is created. Update recipes and conf file which depend
on these packages to check required distro features.

(From OE-Core rev: 58446992de0f16a345f1f55b66d0d34d31dc341b)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2018-12-05 08:00:56 -05:00
committed by Richard Purdie
parent 3a439047bf
commit a035221691
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/include/tclibc-glibc.inc
+1 -1
View File
@@ -32,7 +32,7 @@ LIBC_LOCALE_DEPENDENCIES = "\
glibc-gconv-iso8859-15"
def get_libc_locales_dependencies(d):
if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() :
if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
else:
return ''
meta/recipes-core/glib-2.0/glib.inc
+3 -1
View File
@@ -29,7 +29,9 @@ PACKAGES += "${PN}-codegen ${PN}-utils"
LEAD_SONAME = "libglib-2.0.*"
inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages
inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}"
S = "${WORKDIR}/glib-${PV}"
meta/recipes-core/libxml/libxml2_2.9.8.bb
+3 -1
View File
@@ -38,10 +38,12 @@ PACKAGECONFIG ??= "python \
PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
inherit autotools pkgconfig binconfig-disabled ptest
inherit autotools pkgconfig binconfig-disabled ptest distro_features_check
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}"
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)}"
RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}"
meta/recipes-devtools/mtools/mtools_4.0.19.bb
+3 -1
View File
@@ -37,7 +37,9 @@ SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch"
inherit autotools texinfo
inherit autotools texinfo distro_features_check
REQUIRED_DISTRO_FEATURES_libc-glibc = "libc-charsets libc-locale-code libc-locales"
EXTRA_OECONF = "--without-x"