libc/glibc: use the multi-inclusion capability of the new kconfig
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon May 09 20:15:39 2011 +0200 (2011-05-09)
changeset 24533f3774e7e3b4
parent 2452 ff170381d13a
child 2454 c70da6c50bdb
libc/glibc: use the multi-inclusion capability of the new kconfig

Now that kconfig can include a file multiple times, link the glibc/eglibc
common stuff to two .in.2 files.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
config/config.mk
config/libc/eglibc.in.2
config/libc/glibc-eglibc.in-common
config/libc/glibc.in.2
     1.1 --- a/config/config.mk	Thu May 12 19:46:23 2011 +0200
     1.2 +++ b/config/config.mk	Mon May 09 20:15:39 2011 +0200
     1.3 @@ -118,10 +118,6 @@
     1.4  	    echo "source \"$${file}\"";                                         \
     1.5  	    echo "endif";                                                       \
     1.6  	  done;                                                                 \
     1.7 -	  echo "";                                                              \
     1.8 -	  for file in $(wildcard $(4)/*.in-common); do                          \
     1.9 -	    echo "source \"$${file}\"";                                         \
    1.10 -	  done;                                                                 \
    1.11  	 ) >$(1)
    1.12  	$(SILENT)(echo "# $(2) second part options";                            \
    1.13  	  echo "# Generated file, do not edit!!!";                              \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/config/libc/eglibc.in.2	Mon May 09 20:15:39 2011 +0200
     2.3 @@ -0,0 +1,1 @@
     2.4 +glibc-eglibc.in-common
     2.5 \ No newline at end of file
     3.1 --- a/config/libc/glibc-eglibc.in-common	Thu May 12 19:46:23 2011 +0200
     3.2 +++ b/config/libc/glibc-eglibc.in-common	Mon May 09 20:15:39 2011 +0200
     3.3 @@ -1,8 +1,6 @@
     3.4  # This file contains the common configuration options
     3.5  # that apply to both glibc and eglibc.
     3.6  
     3.7 -if LIBC_glibc || LIBC_eglibc
     3.8 -
     3.9  # Some architectures require the ports addon. List them one by one here:
    3.10  # This list must be carefully in sync with the architectures names
    3.11  # we can find in config/arch/*
    3.12 @@ -18,8 +16,6 @@
    3.13      default y
    3.14      select BINUTILS_FORCE_LD_BFD
    3.15  
    3.16 -comment "glibc/eglibc common options"
    3.17 -
    3.18  config LIBC_GLIBC_EXTRA_CONFIG
    3.19      string
    3.20      prompt "extra config"
    3.21 @@ -152,7 +148,7 @@
    3.22  
    3.23  if KERNEL_linux
    3.24  
    3.25 -choice
    3.26 +choice LIBC_GLIBC_SUPPORTED_KERNEL
    3.27      bool
    3.28      prompt "Minimum supported kernel version"
    3.29      default LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
    3.30 @@ -247,5 +243,3 @@
    3.31      default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_KERNEL_VERSION_CHOSEN
    3.32  
    3.33  endif # KERNEL_linux
    3.34 -
    3.35 -endif # LIBC_glibc || LIBC_eglibc
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/config/libc/glibc.in.2	Mon May 09 20:15:39 2011 +0200
     4.3 @@ -0,0 +1,1 @@
     4.4 +glibc-eglibc.in-common
     4.5 \ No newline at end of file