From: Schantl Stefan <Stevee@ipfire.org>
Date: Fri, 19 Mar 2010 13:58:02 +0000 (+0100)
Subject: glibc: Fix broken locale files.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51d2e4a977c59d01f62b0415c4ec195dc97aee13;p=ipfire-3.x.git

glibc: Fix broken locale files.

As a fact that we are only supporting a few languages atm I´ve disabled the other ones.

This fixes issure #589.
---

diff --git a/pkgs/core/glibc/SUPPORTED.locales b/pkgs/core/glibc/SUPPORTED.locales
new file mode 100644
index 000000000..900387321
--- /dev/null
+++ b/pkgs/core/glibc/SUPPORTED.locales
@@ -0,0 +1,21 @@
+# This file names the currently supported and somewhat tested locales.
+# If you have any additions please file a glibc bug report.
+SUPPORTED-LOCALES=\
+da_DK.UTF-8/UTF-8 \
+da_DK/ISO-8859-1 \
+de_DE.UTF-8/UTF-8 \
+de_DE/ISO-8859-1 \
+de_DE@euro/ISO-8859-15 \
+en_GB.UTF-8/UTF-8 \
+en_GB/ISO-8859-1 \
+en_US.UTF-8/UTF-8 \
+en_US/ISO-8859-1 \
+es_ES.UTF-8/UTF-8 \
+es_ES/ISO-8859-1 \
+es_ES@euro/ISO-8859-15 \
+fr_FR.UTF-8/UTF-8 \
+fr_FR/ISO-8859-1 \
+fr_FR@euro/ISO-8859-15 \
+it_IT.UTF-8/UTF-8 \
+it_IT/ISO-8859-1 \
+it_IT@euro/ISO-8859-15 \
diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 974152795..d1a4f549b 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -163,6 +163,10 @@ define STAGE_PREPARE
 	# Fix a very weird issue with rpath
 	cd $(DIR_APP) && sed -e "s/LDFLAGS-rpath-ORIGIN/LDFLAGS/g" \
 		-i iconvdata/Makefile
+
+	# Copy our customized SUPPORTED file to build localization files
+	# only for supported languages
+	cp -vf $(DIR_SOURCE)/SUPPORTED.locales $(DIR_APP)/localedata/SUPPORTED
 endef
 
 define STAGE_BUILD