summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-17 23:20:31 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-17 23:20:31 +0000
commite478fac75faf3506a3d797b08037321632937587 (patch)
treeb68685d92149ab936c839d4f62a2f231cd99bc4f
parent636e360eea3a0faadd669a409b76fae372c6c38b (diff)
downloadpoky-e478fac75faf3506a3d797b08037321632937587.tar.gz
glibc: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3193 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/glibc/glibc-intermediate_2.5.bb2
-rw-r--r--meta/packages/glibc/glibc-package.bbclass21
2 files changed, 10 insertions, 13 deletions
diff --git a/meta/packages/glibc/glibc-intermediate_2.5.bb b/meta/packages/glibc/glibc-intermediate_2.5.bb
index 1fd6341d8e..661a69a10d 100644
--- a/meta/packages/glibc/glibc-intermediate_2.5.bb
+++ b/meta/packages/glibc/glibc-intermediate_2.5.bb
@@ -5,5 +5,3 @@ require glibc-intermediate.inc
5do_configure_prepend() { 5do_configure_prepend() {
6 sed -i s:-Werror:: ${S}/configure 6 sed -i s:-Werror:: ${S}/configure
7} 7}
8
9
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index 3b966bccb1..bc51d6b1b9 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
27BINARY_LOCALE_ARCHES ?= "arm.*" 27BINARY_LOCALE_ARCHES ?= "arm.*"
28 28
29PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" 29PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
30PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* libc6* locale-base-* glibc-binary-localedata-*" 30PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
31 31
32libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" 32libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
33 33
@@ -56,14 +56,13 @@ DESCRIPTION_localedef = "glibc: compile locale definition files"
56DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." 56DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
57 57
58def get_glibc_fpu_setting(bb, d): 58def get_glibc_fpu_setting(bb, d):
59 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: 59 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
60 return "--without-fp" 60 return "--without-fp"
61 return "" 61 return ""
62 62
63EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" 63EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
64 64
65OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" 65OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
66EXTRA_OECONF_append_arm-linuxeabi = " --without-fp"
67 66
68do_install() { 67do_install() {
69 oe_runmake install_root=${D} install 68 oe_runmake install_root=${D} install
@@ -179,10 +178,10 @@ python package_do_split_gconvs () {
179 bb.error("datadir not defined") 178 bb.error("datadir not defined")
180 return 179 return
181 180
182 gconv_libdir = os.path.join(libdir, "gconv") 181 gconv_libdir = base_path_join(libdir, "gconv")
183 charmap_dir = os.path.join(datadir, "i18n", "charmaps") 182 charmap_dir = base_path_join(datadir, "i18n", "charmaps")
184 locales_dir = os.path.join(datadir, "i18n", "locales") 183 locales_dir = base_path_join(datadir, "i18n", "locales")
185 binary_locales_dir = os.path.join(libdir, "locale") 184 binary_locales_dir = base_path_join(libdir, "locale")
186 185
187 do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv') 186 do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv')
188 187
@@ -256,9 +255,9 @@ python package_do_split_gconvs () {
256 bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) 255 bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
257 bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) 256 bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
258 257
259 treedir = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") 258 treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
260 path = bb.data.getVar("PATH", d, 1) 259 path = bb.data.getVar("PATH", d, 1)
261 i18npath = os.path.join(treedir, datadir, "i18n") 260 i18npath = base_path_join(treedir, datadir, "i18n")
262 261
263 localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) 262 localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
264 cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) 263 cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)