From b09fe32ebb5375215820ba5b2f2def3a8b7db730 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 26 Aug 2006 21:20:14 +0000
Subject: glibc 2.4: also mask out gez_ER

---
 packages/glibc/glibc_2.4.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'packages/glibc')

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 5d8df56280..62be40d299 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-DEFAULT_PREFERENCE = "-1"
 PR = "r10"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
@@ -16,7 +15,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 GLIBC_EXTRA_OECONF ?= ""
 
-GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN"
+GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
@@ -123,6 +122,12 @@ do_munge() {
 
 addtask munge before do_patch after do_unpack
 
+# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
+do_configure_prepend() {
+        sed -i s:-Werror:: ${S}/configure
+}
+
+
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
-- 
cgit v1.2.3


From 539d4da18a4337f44d0fd98dc04d5ebf00ce82a0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 26 Aug 2006 21:33:21 +0000
Subject: glibc 2.4: remove spurious committed Werror bit

---
 packages/glibc/glibc_2.4.bb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'packages/glibc')

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 62be40d299..5ee57d4430 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -122,11 +122,6 @@ do_munge() {
 
 addtask munge before do_patch after do_unpack
 
-# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
-do_configure_prepend() {
-        sed -i s:-Werror:: ${S}/configure
-}
-
 
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
-- 
cgit v1.2.3


From 4be216128262f49d669c3c224a398eb4bfb5c32b Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 27 Aug 2006 11:31:19 +0000
Subject: glibc: use libs from /lib instead of  for binary locale generation

---
 packages/glibc/glibc-package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/glibc')

diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 3ce10b54de..ecf086815d 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -143,7 +143,7 @@ do_prep_locale_tree() {
 	for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
 		gunzip $i
 	done
-	cp -a ${STAGING_LIBDIR}/* $treedir/lib
+	cp -a ${D}/lib/* $treedir/lib
 	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
 		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
 	fi
-- 
cgit v1.2.3