[commits] r1152 - in /trunk/libc: ChangeLog.eglibc localedata/Makefile option-groups.def option-groups.defaults option-groups.mak

[jimb@xxxxxxxxxx]

Author: jimb
Date: Tue Jan  9 15:54:49 2007
New Revision: 1152

Log:
ChangeLog.eglibc:
2006-12-26  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>

       * option-groups.def, option-groups.defaults (OPTION_EGLIBC_LOCALES):
       New option group.
       * localedata/Makefile: Trim locale lists if
       OPTION_EGLIBC_LOCALES is not enabled.

       * option-groups.mak: Allow includer to override the option
       group config file name.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/localedata/Makefile
    trunk/libc/option-groups.def
    trunk/libc/option-groups.defaults
    trunk/libc/option-groups.mak

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Tue Jan  9 15:54:49 2007
@@ -1,3 +1,13 @@
+2006-12-26  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+        * option-groups.def, option-groups.defaults (OPTION_EGLIBC_LOCALES):
+        New option group.
+        * localedata/Makefile: Trim locale lists if
+        OPTION_EGLIBC_LOCALES is not enabled.
+
+        * option-groups.mak: Allow includer to override the option
+        group config file name.
+
 2006-12-08  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Add rudimentary option group support.

Modified: trunk/libc/localedata/Makefile
==============================================================================
--- trunk/libc/localedata/Makefile (original)
+++ trunk/libc/localedata/Makefile Tue Jan  9 15:54:49 2007
@@ -22,15 +22,26 @@
 
 all: # Make this the default target; it will be defined in Rules.
 
+include ../option-groups.mak
+
 # List with all available character set descriptions.
-charmaps := $(filter-out $(addprefix charmaps/, CVS RCS SCCS %~), \
-				     $(wildcard charmaps/[A-I]*) \
-				     $(wildcard charmaps/[J-Z]*))
+all-charmaps := $(filter-out $(addprefix charmaps/, CVS RCS SCCS %~), \
+					 $(wildcard charmaps/[A-I]*) \
+					 $(wildcard charmaps/[J-Z]*))
 
 # List with all available character set descriptions.
-locales := $(filter-out $(addprefix locales/, CVS RCS SCCS %~), \
-				    $(wildcard locales/*))
-
+all-locales := $(filter-out $(addprefix locales/, CVS RCS SCCS %~), \
+			    $(wildcard locales/*))
+
+# If the EGLIBC_LOCALES option group is not enabled, trim the
+# list of charmap and locale source files.
+ifeq ($(OPTION_EGLIBC_LOCALES),y)
+charmaps := $(all-charmaps)
+locales  := $(all-locales)
+else
+charmaps := 
+locales  := locales/POSIX
+endif
 
 subdir-dirs = tests-mbwc
 vpath %.c tests-mbwc
@@ -60,7 +71,7 @@
 		  $(addprefix tstfmon_,$(fmon-tests))			\
 
 distribute := CHECKSUMS README SUPPORTED ChangeLog			\
-	      $(charmaps) $(locales)					\
+	      $(all-charmaps) $(all-locales)				\
 	      tst-rpmatch.sh tst-locale.sh tst-fmon.sh sort-test.sh	\
 	      tst-fmon.data $(test-input-data) $(ld-test-srcs)		\
 	      th_TH.in cs_CZ.in tst-mbswcs.sh tst-trans.sh tst-ctype.sh \
@@ -202,6 +213,11 @@
 endif
 
 include SUPPORTED
+
+# Only install locale data if OPTION_EGLIBC_LOCALES is selected.
+ifneq ($(OPTION_EGLIBC_LOCALES),y)
+SUPPORTED-LOCALES :=
+endif
 
 INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
 

Modified: trunk/libc/option-groups.def
==============================================================================
--- trunk/libc/option-groups.def (original)
+++ trunk/libc/option-groups.def Tue Jan  9 15:54:49 2007
@@ -42,3 +42,10 @@
    help
        This option group includes functions for accessing message
        catalogs: catopen, catclose, and catgets.
+
+config OPTION_EGLIBC_LOCALES
+   bool "Locale definitions"
+   help
+       This option group includes all locale definitions other than
+       that for the "C" locale.  If this option group is omitted, then
+       only the "C" locale is supported.

Modified: trunk/libc/option-groups.defaults
==============================================================================
--- trunk/libc/option-groups.defaults (original)
+++ trunk/libc/option-groups.defaults Tue Jan  9 15:54:49 2007
@@ -9,3 +9,4 @@
 #
 # By default, all option groups are enabled.
 OPTION_EGLIBC_CATGETS = y
+OPTION_EGLIBC_LOCALES = y

Modified: trunk/libc/option-groups.mak
==============================================================================
--- trunk/libc/option-groups.mak (original)
+++ trunk/libc/option-groups.mak Tue Jan  9 15:54:49 2007
@@ -1,11 +1,18 @@
 # Setup file for subdirectory Makefiles that define EGLIBC option groups.
+
+# EGLIBC shouldn't need to override this.  However, the
+# cross-build-friendly localedef includes this makefile to get option
+# group variable definitions; it uses a single build tree for all the
+# multilibs, and needs to be able to specify a different option group
+# configuration file for each multilib.
+option_group_config_file ?= $(objdir)/option-groups.config
 
 # Read the default settings for all options.
 include $(..)option-groups.defaults
 
 # Read the developer's option group selections, overriding the
 # defaults from option-groups.defaults.
--include $(objdir)/option-groups.config
+-include $(option_group_config_file)
 
 # Establish 'routines-y', etc. as simply expanded variables.
 routines-y     :=