merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'

     and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'

6 files changed, 75 insertions, 5 deletions

diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass
index 0cb8497733..a859ac2ca9 100644
--- a/packages/glibc/eglibc-package.bbclass
+++ b/packages/glibc/eglibc-package.bbclass
@@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
-PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
 
 RPROVIDES_eglibc = "glibc"
 RPROVIDES_eglibc-utils = "glibc-utils"
@@ -210,6 +210,7 @@ python package_do_split_gconvs () {
 		f.close()
 		if deps != []:
 			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d)
 
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
@@ -261,6 +262,7 @@ python package_do_split_gconvs () {
 		else:
 			eglibc_name = name
 		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+		bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d)
 		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
 		m = re.match("(.*)_(.*)", name)
 		if m:
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index da33cca3fa..ff68185bcc 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -2,8 +2,8 @@ require glibc.inc
 
 DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
-PV = "2.6+svnr${SRCREV}"
-PR = "r1"
+PV = "2.7+svnr${SRCREV}"
+PR = "r2"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
diff --git a/packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch b/packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch
new file mode 100644
index 0000000000..138c5414cb
--- /dev/null
+++ b/packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch
@@ -0,0 +1,21 @@
+Fixes
+checking version of powerpc-405-linux-gnu-gcc ... 4.0.0, bad
+checking for gnumake... no
+checking for gmake... no
+checking for make... make
+checking version of make... 3.80, ok
+configure: error:
+*** These critical programs are missing or too old:gcc 
+
+
+--- glibc-2.2.5/configure.old	2005-03-10 00:23:46.374213600 -0800
++++ glibc-2.2.5/configure	2005-03-10 00:25:13.313996744 -0800
+@@ -1476,7 +1476,7 @@
+   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    *gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*)
++    *gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|4.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 
diff --git a/packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch b/packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch
new file mode 100644
index 0000000000..bda01b4267
--- /dev/null
+++ b/packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch
@@ -0,0 +1,41 @@
+See http://sources.redhat.com/ml/crossgcc/2003-11/msg00111.html
+Might fix error
+... gcc-3.2.3-glibc-2.3.2/build-glibc/csu/version-info.h:8: too many decimal points in floating constant
+make[2]: ***
+when building on Solaris.  I haven't seen this be needed yet, but what the heck,
+here it is in case someone needs it.
+
+Retrieved with http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/csu/Makefile.diff?r1=1.70&r2=1.71&cvsroot=glibc
+
+Revision 1.71, Thu Sep 25 20:29:39 2003 UTC (8 months, 2 weeks ago) by drepper
+Branch: MAIN
+CVS Tags: glibc-2_3_3
+
+($(objpfx)version-info.h): Fix sed script to handle banners.
+
+===================================================================
+RCS file: /cvs/glibc/libc/csu/Makefile,v
+retrieving revision 1.70
+retrieving revision 1.71
+diff -u -r1.70 -r1.71
+--- libc/csu/Makefile	2003/06/26 07:27:39	1.70
++++ libc/csu/Makefile	2003/09/25 20:29:39	1.71
+@@ -222,14 +222,14 @@
+ 		   if [ -z "$$os" ]; then \
+ 		     os=Linux; \
+ 		   fi; \
+-		   echo "\"Compiled on a $$os $$version system" \
+-			"on `date +%Y-%m-%d`.\\n\"" ;; \
++		   printf '"Compiled on a %s %s system on %s.\\n"\n' \
++			"$os" "$version" "`date +%Y-%m-%d`" ;; \
+ 	   *) ;; \
+ 	 esac; \
+ 	 files="$(all-Banner-files)";				\
+ 	 if test -n "$$files"; then				\
+-	   echo "\"Available extensions:\\n\"";			\
++	   printf '"Available extensions:\\n"\n';		\
+ 	   sed -e '/^#/d' -e 's/^[[:space:]]*/	/'		\
+-	       -e 's/\(^.*$$\)/\"\1\\n\"/' $$files;		\
++	       -e 's/^\(.*\)$$/\"\1\\n\"/' $$files;		\
+ 	 fi) > $@T
+ 	mv -f $@T $@
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 1f14bb83fb..b96aae37b9 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -220,10 +220,13 @@ python package_do_split_gconvs () {
 	dot_re = re.compile("(.*)\.(.*)")
 
 	# Collate the locales by base and encoding
+	utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0)
 	encodings = {}
 	for l in supported:
 		l = l[:-1]
 		(locale, charset) = l.split(" ")
+		if utf8_only and charset != 'UTF-8':
+			continue
 		m = dot_re.match(locale)
 		if m:
 			locale = m.group(1)
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 7b5eca2432..2a3bfd26df 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r13"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
@@ -63,6 +63,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \
 	   file://errlist-arm.patch;patch=1 \
 	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;patch=1 \
 	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch;patch=1 \
+	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch;patch=1 \
 	   file://glibc-2.2.5-alpha-pwrite64.patch;patch=1 \
 	   file://glibc-2.2.5-arm-pwrite64.patch;patch=1 \
 	   file://glibc-2.2.5-crosstest.patch;patch=1 \
@@ -95,6 +96,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \
 	   file://threadparam.patch;patch=1 \
 	   file://initfini-flags.patch;patch=1 \
 	   file://pt-initfini-flags.patch;patch=1 \
+	   file://glibc-2.3.2-allow-solaris.patch;patch=1 \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
@@ -161,7 +163,7 @@ do_stage() {
 	rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
 	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
 		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
-		   '${STAGING_DIR_HOST}${layout_base_libdir}libc.so.6' \
+		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
 		   '${STAGING_INCDIR}/bits/errno.h' \
 		   '${STAGING_INCDIR}/bits/libc-lock.h' \
 		   '${STAGING_INCDIR}/gnu/stubs.h' \
@@ -199,6 +201,7 @@ require glibc-package.bbclass
 
 PACKAGES_unslung = "libc6-unslung"
 PACKAGE_ARCH_unslung = "nslu2"
+PACKAGE_NO_GCONV_unslung = "1"
 RDEPENDS_libc6-unslung = "nslu2-linksys-libs"
 RPROVIDES_libc6-unslung = "libc6"