From b339c942c14523b261d0205c0452d79d11bb0278 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 10 Feb 2012 09:43:23 +0000
Subject: [PATCH] Add a choice between installing the full set of supported
 locales and installing just the minimal set for tests, after glibc build. If
 the second option is chosen, the locale specified in LANG is also installed,
 if not in the minimal set.

---
 Config.in                            | 16 ++++++++++++++--
 LFS/lfs.xsl                          | 26 ++++++++++++++++++++++++--
 common/libs/func_book_parser         |  1 +
 common/libs/func_validate_configs.sh |  2 +-
 jhalfs                               |  1 +
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/Config.in b/Config.in
index 5bbf4dc..b193ed8 100644
--- a/Config.in
+++ b/Config.in
@@ -260,7 +260,7 @@ menu "--- BOOK Settings"
 		default	"hppa1.1-unknown-linux-gnu"	if  PROC_hppa1
 		default	"hppa2.0-unknown-linux-gnu"	if  PROC_hppa2
 
-		default	"arm-unknown-linux-gnu"		if  ARCH_ARM && BOOK_CLFS2
+		default	"arm-unknown-linux-gnueabi"	if  ARCH_ARM && BOOK_CLFS2
 
 		default "arm-unknown-linux-uclibc"	if  PROC_ARM
 		default "armv5l-unknown-linux-uclibc"	if  PROC_ARM5L
@@ -980,7 +980,19 @@ menu "--- Build Settings"
 		string "Language"
 		default "$LANG"
 		help
-			#-- Language information in /etc/profile  See <locale -a> for values
+			#-- LANG variable set in /etc/profile
+			#   See http://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED
+			#   for values (or the file localedata/SUPPORTED in glibc tarball)
+
+	config  FULL_LOCALE
+		bool "Install the full set of locales"
+		default n
+		help
+			#-- If set to y, the full set of supported locales
+			#   will be installed. Otherwise, only the minimal set
+			#   necessary for the tests will be installed,
+			#   together with the locale associated to the
+			#   LANG you have chosen, if not in the minimal set.
 
 	#--- Groff page
 	choice
diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 932684a..9f681ca 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -39,6 +39,9 @@
   
   <!-- Locale settings -->
   <xsl:param name="lang" select="C"/>
+
+  <!-- Install the whole set of locales -->
+  <xsl:param name='full-locale' select='n'/>
   
   <xsl:template match="/">
     <xsl:apply-templates select="//sect1"/>
@@ -180,8 +183,27 @@ rm -rf $PKG_DEST
         <xsl:text>&#xA;</xsl:text>
       </xsl:if>
       <xsl:if test="@id='ch-system-glibc'">
-	<xsl:copy-of select="//userinput[@remap='locale-full']"/>
-	<xsl:text>&#xA;</xsl:text>
+        <xsl:choose>
+          <xsl:when test="$full-locale='y'">
+            <xsl:copy-of select="//userinput[@remap='locale-full']"/>
+            <xsl:text>&#xA;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:copy-of select="//userinput[@remap='locale-test']"/>
+            <xsl:text>&#xA;</xsl:text>
+            <xsl:if test="not(contains(string(//userinput[@remap='locale-test']),$lang)) and $lang!='C' and $lang!='POSIX'">
+              <xsl:text>if LOCALE=`grep "</xsl:text>
+              <xsl:value-of select="$lang"/>
+              <xsl:text>/" $PKGDIR/localedata/SUPPORTED`; then
+  CHARMAP=`echo $LOCALE | sed 's,[^/]*/\([^ ]*\) [\],\1,'`
+  INPUT=`echo $LOCALE | sed 's,[/.].*,,'`
+  LOCALE=`echo $LOCALE | sed 's,/.*,,'`
+  localedef -i $INPUT -f $CHARMAP $LOCALE
+fi
+</xsl:text>
+            </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:if>
       <xsl:apply-templates
          select=".//screen[
diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index d9add75..300534d 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -141,6 +141,7 @@ extract_commands() {         #
                  --stringparam testsuite $TEST \
                  --stringparam bomb-testsuite $BOMB_TEST \
                  --stringparam vim-lang $VIMLANG \
+                 --stringparam full-locale $FULL_LOCALE \
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE \
                  --stringparam lang $LANG \
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index 4f474a7..466dde4 100644
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@@ -41,7 +41,7 @@ inline_doc
   local -r CLFS3_book="$BOOK_common                  $BOOK_clfsX PLATFORM MIPS_LEVEL"
 
   # Build Settings by book
-  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT"
+  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT FULL_LOCALE"
   local -r  HLFS_build="$BUILD_chroot         $BUILD_common"
   local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
   local -r CLFS2_build="STRIP         VIMLANG $BUILD_common"
diff --git a/jhalfs b/jhalfs
index 99206c6..7135a97 100755
--- a/jhalfs
+++ b/jhalfs
@@ -107,6 +107,7 @@ BOMB_TEST=${BOMB_TEST:-n}
 STRIP=${STRIP:=n}
 REPORT=${REPORT:=n}
 VIMLANG=${VIMLANG:-n}
+FULL_LOCALE=${FULL_LOCALE:-n}
 GRSECURITY_HOST=${GRSECURITY_HOST:-n}
 CUSTOM_TOOLS=${CUSTOM_TOOLS:-n}
 REBUILD_MAKEFILE=${REBUILD_MAKEFILE:-n}