Toolchain: eglibc: Completely rework the way eglibc options are computed

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

5 files changed, 146 insertions, 132 deletions

diff --git a/mk/eglibc-2.10-options.mk b/mk/eglibc-2.10-options.mk
index 2cf53ab..a4cd022 100644
--- a/mk/eglibc-2.10-options.mk
+++ b/mk/eglibc-2.10-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,34 +23,34 @@
 # \date         May 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CATGETS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FCVT			\
-		OPTION_EGLIBC_FMTMSG			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_FTRAVERSE			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_REGEXP_GLIBC		\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CATGETS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FCVT=n
+OPTION_EGLIBC_FMTMSG=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_FTRAVERSE=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_REGEXP_GLIBC=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc-2.11-options.mk b/mk/eglibc-2.11-options.mk
index 639daf0..1544f64 100644
--- a/mk/eglibc-2.11-options.mk
+++ b/mk/eglibc-2.11-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,36 +23,36 @@
 # \date         Nov 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BIG_MACROS		\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CATGETS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FCVT			\
-		OPTION_EGLIBC_FMTMSG			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_FTRAVERSE			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_MEMUSAGE			\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_REGEXP_GLIBC		\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6=n
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BIG_MACROS=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CATGETS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FCVT=n
+OPTION_EGLIBC_FMTMSG=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_FTRAVERSE=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_MEMUSAGE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_REGEXP_GLIBC=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc-2.9-options.mk b/mk/eglibc-2.9-options.mk
index ec640dd..797104f 100644
--- a/mk/eglibc-2.9-options.mk
+++ b/mk/eglibc-2.9-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,29 +23,29 @@
 # \date         May 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6=n
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc-trunk-options.mk b/mk/eglibc-trunk-options.mk
index 1d3a345..21587a2 100644
--- a/mk/eglibc-trunk-options.mk
+++ b/mk/eglibc-trunk-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,42 +23,42 @@
 # \date         August 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BIG_MACROS		\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CATGETS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_CRYPT			\
-		OPTION_EGLIBC_CRYPT_UFC			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FCVT			\
-		OPTION_EGLIBC_FMTMSG			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_FTRAVERSE			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_IDN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_INET_ANL			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LIBM_BIG			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_MEMUSAGE			\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_RTLD_DEBUG		\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_REGEXP_GLIBC		\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6=n
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BIG_MACROS=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CATGETS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_CRYPT=n
+OPTION_EGLIBC_CRYPT_UFC=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FCVT=n
+OPTION_EGLIBC_FMTMSG=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_FTRAVERSE=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_IDN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_INET_ANL=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LIBM_BIG=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_MEMUSAGE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_RTLD_DEBUG=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_REGEXP_GLIBC=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index f263906..79111d7 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -38,8 +38,7 @@ else
 EGLIBC_FLOAT_TYPE := --with-fp=yes
 endif
 
-#EGLIBC options
-include $(EMBTK_ROOT)/mk/eglibc-options-parse.mk
+OPTION_GROUPS_FILE = $(EMBTK_ROOT)/mk/eglibc-$(EGLIBC_VERSION)-options.mk
 
 eglibc-headers_install: $(EGLIBC_HEADERS_BUILD_DIR)/.installed
 eglibc_install: $(EGLIBC_BUILD_DIR)/.installed
@@ -132,3 +131,18 @@ $(EGLIBC_BUILD_DIR)/.configured:
 	--disable-profile --without-gd --without-cvs --enable-add-ons \
 	--enable-kernel="2.6.0"
 	@touch $@
+
+EGLIBC_OPTIONS_PARSE:
+	$(call EMBTK_GENERIC_MESSAGE,"Parsing \
+	eglibc-$(EGLIBC_VERSION) option groups...")
+	@cat $(OPTION_GROUPS_FILE) > $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@echo "#######################################################" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@echo "# From embtoolkit-$(EMBTK_VERSION) configuration menu #" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@echo "#######################################################" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@grep "CONFIG_KEMBTK_EGLIBC_" $(EMBTK_ROOT)/.config | \
+	sed -e 's/CONFIG_KEMBTK_EGLIBC_*//g' \
+	>> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@sed -i 's/"//g' $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@cp $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config \
+	$(EGLIBC_BUILD_DIR)/option-groups.config
+