Toolchain: Allow users to checkout svn trunk of eglibc

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

4 files changed, 61 insertions, 10 deletions

diff --git a/mk/eglibc-options-parse.mk b/mk/eglibc-options-parse.mk
index 78df89b..0eb5bbe 100644
--- a/mk/eglibc-options-parse.mk
+++ b/mk/eglibc-options-parse.mk
@@ -1,4 +1,4 @@
-#########################################################################################
+################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
 #
@@ -14,14 +14,14 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#########################################################################################
+################################################################################
 #
 # \file         eglibc-options-parse.mk
-# \brief	eglibc-options-parse.mk. Here we define a target which parses eglibc
-# \brief	options from .config.
+# \brief	eglibc-options-parse.mk. Here we define a target which parses
+# \brief	eglibc options from .config.
 # \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # \date         May 2009
-#########################################################################################
+################################################################################
 
 ifeq ($(CONFIG_EMBTK_EGLIBC_VERSION_2_10),y)
 include $(EMBTK_ROOT)/mk/eglibc-2.10-options.mk
@@ -31,10 +31,17 @@ ifeq ($(CONFIG_EMBTK_EGLIBC_VERSION_2_9),y)
 include $(EMBTK_ROOT)/mk/eglibc-2.9-options.mk
 endif
 
+ifeq ($(CONFIG_EMBTK_EGLIBC_VERSION_TRUNK),y)
+include $(EMBTK_ROOT)/mk/eglibc-trunk-options.mk
+endif
+
 EGLIBC_OPTIONS_PARSE:
-	@echo "####################################### EmbToolkit ######################################"
-	@echo "# Parsing eglibc options ...                                                            #"
-	@echo "#########################################################################################"
+	@echo "####################################### EmbToolkit #############\
+	#########################"
+	@echo "# Parsing eglibc options ...                                    \
+	                        #"
+	@echo "################################################################\
+	#########################"
 	@for i in $(EGLIBC_OPTIONS); \
 	do \
 	echo "Does eglibc will support $$i?"; \
diff --git a/mk/eglibc-trunk-options.mk b/mk/eglibc-trunk-options.mk
new file mode 100644
index 0000000..f5ec9ac
--- /dev/null
+++ b/mk/eglibc-trunk-options.mk
@@ -0,0 +1,37 @@
+################################################################################
+# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# Copyright(C) 2009 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
+# (Version 2 or later) published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+################################################################################
+#
+# \file         eglibc-trunk-options.mk
+# \brief	eglibc-trunk-options.mk. Here we define options supported by
+# \brief	eglibc-trunk.
+# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \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_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_UTMPX OPTION_EGLIBC_WORDEXP \
+	OPTION_POSIX_C_LANG_WIDE_CHAR OPTION_POSIX_REGEXP \
+	OPTION_POSIX_REGEXP_GLIBC OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index a561116..0ed2dc6 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -54,9 +54,16 @@ $(EGLIBC_HEADERS_BUILD_DIR)/.installed: eglibc_download \
 eglibc_download:
 	$(call EMBTK_GENERIC_MESSAGE,"downloading eglibc-$(EGLIBC_VERSION) \
 	if necessary ...")
+ifeq ($(CONFIG_EMBTK_EGLIBC_VERSION_STRING),"trunk")
+	@cd $(EMBTK_ROOT)/src; \
+	svn co $(EGLIBC_SVN_SITE)/trunk \
+	-r$(EGLIBC_SVN_REVISION) eglibc-$(EGLIBC_VERSION)
+else
 	@cd $(EMBTK_ROOT)/src; \
 	svn co $(EGLIBC_SVN_SITE)/branches/eglibc-$(EGLIBC_BRANCH) \
-	-r$(EGLIBC_SVN_REVISION) eglibc-$(EGLIBC_VERSION); \
+	-r$(EGLIBC_SVN_REVISION) eglibc-$(EGLIBC_VERSION)
+endif
+	@cd $(EMBTK_ROOT)/src; \
 	cd eglibc-$(EGLIBC_VERSION); touch `find . -name configure`; cd ../;\
 	test -e $(DOWNLOAD_DIR)/$(EGLIBC_PACKAGE) || \
 	tar cjvf $(EGLIBC_PACKAGE) eglibc-$(EGLIBC_VERSION); \
diff --git a/mk/initialpath.mk b/mk/initialpath.mk
index ae4f903..3a799da 100644
--- a/mk/initialpath.mk
+++ b/mk/initialpath.mk
@@ -49,5 +49,5 @@ ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
 endif
 
 rmallpath:
-	@rm -Rf build rootfs-* sysroot-* tools-*
+	@rm -Rf build rootfs-* sysroot-* tools-* $(DOWNLOAD_DIR)/eglibc*