Skip to contentSkip to conversation

Removing hard coded libdir for libc locale generating

PATCH Superseded Lianhao Lu 2 participants 3 messages Jun 23, 2011

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Removing hard coded libdir for libc locale generating

The patch replaces the hard coded libdir in package_do_split_gconvs() in libc-package.bbclass to meet the requirement of multilib.

The following changes since commit b04ee632eb06650dde3e3ee8c4788a45cae0aa5e:
Richard Purdie (1):
multilib: First pass from RP

are available in the git repository at:

git://git.pokylinux.org/poky-contrib llu/ml
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/ml

Lianhao Lu (1):
libc-package.bbclass: Replace hard coded libdir.

 meta/classes/libc-package.bbclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
author
#1 lore raw

PATCH 1/1 libc-package.bbclass: Replace hard coded libdir.

Replace the hard coded libdir for locale generating to meet the multilib requirement.

Signed-off-by Lianhao Lu <[email protected]>
---
 meta/classes/libc-package.bbclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
meta/classes/libc-package.bbclass +4 -3
index 55e3d48..84bac5d 100644
@@ -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)
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 1/1] libc-package.bbclass: Replace hard coded libdir.

Quoted 13 lines · Lianhao Lu

Replace the hard coded libdir for locale generating to meet the multilib requirement.

Signed-off-by Lianhao Lu <[email protected]>
---
 meta/classes/libc-package.bbclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
meta/classes/libc-package.bbclass +0 -0
index 55e3d48..84bac5d 100644

meta/classes/libc-package.bbclass python package_do_split_gconvs () { · line 280

Quoted 5 lines
meta/classes/libc-package.bbclass +1 -1
@@ -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.

Quoted 8 lines
meta/classes/libc-package.bbclass +1 -0
 		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":

meta/classes/libc-package.bbclass python package_do_split_gconvs () { · line 308

Quoted 10 lines
meta/classes/libc-package.bbclass +2 -2
@@ -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