Removing hard coded libdir for libc locale generating

PATCH Applied Lianhao Lu 2 participants 3 messages Jun 23, 2011 – Jun 28, 2011

lore

Share & tools

lore

Lianhao Lu

author

2011-06-23 13:36 UTC #0 lore raw

v2 cover Removing hard coded libdir for libc locale generating

V2:

Use base_libdir instead of libdir for ldlibdir.
----------------------------------------------------
V1:
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(-)

Lianhao Lu

author

2011-06-23 13:36 UTC #1 lore raw

PATCH v2 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..5db46ce 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, bb.data.getVar("base_libdir", d, 1))
 		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

Richard Purdie

Applied

2011-06-28 11:16 UTC #2 lore raw

In reply to Lianhao Lu

Quoted 11 lines · Lianhao Lu

V2:
Use base_libdir instead of libdir for ldlibdir.
----------------------------------------------------
V1:
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

Quoted 7 lines

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.

Merged to master, thanks.

Richard