summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/libc-package.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 5737af4dfc..4bc58c8e57 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -253,10 +253,11 @@ python package_do_split_gconvs () {
253 253
254 def output_locale_binary(name, pkgname, locale, encoding): 254 def output_locale_binary(name, pkgname, locale, encoding):
255 treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") 255 treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
256 ldlibdir = "%s/lib" % treedir 256 ldlibdir = base_path_join(treedir, bb.data.getVar("base_libdir", d, 1))
257 path = bb.data.getVar("PATH", d, 1) 257 path = bb.data.getVar("PATH", d, 1)
258 i18npath = base_path_join(treedir, datadir, "i18n") 258 i18npath = base_path_join(treedir, datadir, "i18n")
259 gconvpath = base_path_join(treedir, "iconvdata") 259 gconvpath = base_path_join(treedir, "iconvdata")
260 outputpath = base_path_join(treedir, libdir, "locale")
260 261
261 use_cross_localedef = bb.data.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", d, 1) or "0" 262 use_cross_localedef = bb.data.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", d, 1) or "0"
262 if use_cross_localedef == "1": 263 if use_cross_localedef == "1":
@@ -276,8 +277,8 @@ python package_do_split_gconvs () {
276 raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options") 277 raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options")
277 278
278 localedef_opts += " --force --old-style --no-archive --prefix=%s \ 279 localedef_opts += " --force --old-style --no-archive --prefix=%s \
279 --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/usr/lib/locale/%s" \ 280 --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \
280 % (treedir, treedir, datadir, locale, encoding, treedir, name) 281 % (treedir, treedir, datadir, locale, encoding, outputpath, name)
281 282
282 cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \ 283 cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \
283 (path, i18npath, gconvpath, localedef_opts) 284 (path, i18npath, gconvpath, localedef_opts)