| Submitter | Lianhao Lu |
|---|---|
| Date | June 23, 2011, 11:33 a.m. |
| Message ID | <8a1cd7c84d12ad10df0de5a84f7d54128e6e38bf.1308827218.git.lianhao.lu@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/6403/ |
| State | New, archived |
| Headers | show |
Comments
On Thu, 2011-06-23 at 19:33 +0800, Lianhao Lu wrote: > Replace the hard coded libdir for locale generating to meet the multilib > requirement. > > Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> > --- > meta/classes/libc-package.bbclass | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass > index 55e3d48..84bac5d 100644 > --- a/meta/classes/libc-package.bbclass > +++ b/meta/classes/libc-package.bbclass > @@ -277,10 +277,11 @@ python package_do_split_gconvs () { > > def output_locale_binary(name, pkgname, locale, encoding): > treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") > - ldlibdir = "%s/lib" % treedir > + ldlibdir = base_path_join(treedir,libdir) I think this should be base_libdir, not libdir. > path = bb.data.getVar("PATH", d, 1) > i18npath = base_path_join(treedir, datadir, "i18n") > gconvpath = base_path_join(treedir, "iconvdata") > + outputpath = base_path_join(treedir, libdir, "locale") > > use_cross_localedef = bb.data.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", d, 1) or "0" > if use_cross_localedef == "1": > @@ -300,8 +301,8 @@ python package_do_split_gconvs () { > raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options") > > localedef_opts += " --force --old-style --no-archive --prefix=%s \ > - --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/usr/lib/locale/%s" \ > - % (treedir, treedir, datadir, locale, encoding, treedir, name) > + --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \ > + % (treedir, treedir, datadir, locale, encoding, outputpath, name) > > cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \ > (path, i18npath, gconvpath, localedef_opts) But otherwise this looks like a sensible change to me! Cheers, Richard
Patch
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 55e3d48..84bac5d 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -277,10 +277,11 @@ python package_do_split_gconvs () { def output_locale_binary(name, pkgname, locale, encoding): treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") - ldlibdir = "%s/lib" % treedir + ldlibdir = base_path_join(treedir,libdir) path = bb.data.getVar("PATH", d, 1) i18npath = base_path_join(treedir, datadir, "i18n") gconvpath = base_path_join(treedir, "iconvdata") + outputpath = base_path_join(treedir, libdir, "locale") use_cross_localedef = bb.data.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", d, 1) or "0" if use_cross_localedef == "1": @@ -300,8 +301,8 @@ python package_do_split_gconvs () { raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options") localedef_opts += " --force --old-style --no-archive --prefix=%s \ - --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/usr/lib/locale/%s" \ - % (treedir, treedir, datadir, locale, encoding, treedir, name) + --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \ + % (treedir, treedir, datadir, locale, encoding, outputpath, name) cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \ (path, i18npath, gconvpath, localedef_opts)
Replace the hard coded libdir for locale generating to meet the multilib requirement. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> --- meta/classes/libc-package.bbclass | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)