diff options
-rw-r--r-- | meta/classes/libc-package.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index de572302d4..0d5ce20fe5 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
@@ -191,7 +191,7 @@ python package_do_split_gconvs () { | |||
191 | 191 | ||
192 | do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \ | 192 | do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \ |
193 | description='locale definition for %s', hook=calc_locale_deps, extra_depends='') | 193 | description='locale definition for %s', hook=calc_locale_deps, extra_depends='') |
194 | bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bpn + '-gconv', d) | 194 | bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bb.data.getVar('MLPREFIX', d) + bpn + '-gconv', d) |
195 | 195 | ||
196 | use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) | 196 | use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) |
197 | 197 | ||
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index b496ce696c..ca3940dc52 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc | |||
@@ -41,7 +41,10 @@ PACKAGES_DYNAMIC = "locale-base-* \ | |||
41 | 41 | ||
42 | DESCRIPTION_localedef = "eglibc: compile locale definition files" | 42 | DESCRIPTION_localedef = "eglibc: compile locale definition files" |
43 | 43 | ||
44 | FILES_eglibc-gconv = "${libdir}/gconv/*" | 44 | # eglibc-gconv is dynamically added into PACKAGES, thus |
45 | # FILES_eglibc-gconv will not be automatically extended in multilib. | ||
46 | # Explicitly add ${MLPREFIX} for FILES_eglibc-gconv. | ||
47 | FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*" | ||
45 | FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" | 48 | FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" |
46 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" | 49 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" |
47 | 50 | ||