Allow broader dependency in generated config files: newlib
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Mar 22 23:04:57 2009 +0000 (2009-03-22)
branchnewlib
changeset 13617f00c31a3235
parent 1360 ea6ce077e35e
child 1362 6671c6467171
Allow broader dependency in generated config files:
- recognise '^# depends on ' pattern in config files
- use that pattern to generate appropriate dependency rules
- convert users of the old pattern to the new one

/branches/newlib/config/libc/eglibc.in | 2 1 1 0 +-
/branches/newlib/config/config.mk | 20 8 12 0 ++++++++------------
/branches/newlib/config/arch/sh.in | 2 1 1 0 +-
/branches/newlib/config/arch/ia64.in | 2 1 1 0 +-
/branches/newlib/config/arch/powerpc64.in | 2 1 1 0 +-
5 files changed, 12 insertions(+), 16 deletions(-)
config/arch/ia64.in
config/arch/powerpc64.in
config/arch/sh.in
config/config.mk
config/libc/eglibc.in
     1.1 --- a/config/arch/ia64.in	Sun Mar 22 22:49:44 2009 +0000
     1.2 +++ b/config/arch/ia64.in	Sun Mar 22 23:04:57 2009 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  # ia64 specific config options
     1.5 -# EXPERIMENTAL
     1.6 +# depends on EXPERIMENTAL
     1.7  
     1.8  config ARCH_ia64
     1.9      select ARCH_64
     2.1 --- a/config/arch/powerpc64.in	Sun Mar 22 22:49:44 2009 +0000
     2.2 +++ b/config/arch/powerpc64.in	Sun Mar 22 23:04:57 2009 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  # powerpc specific configuration file
     2.5 -# EXPERIMENTAL
     2.6 +# depends on EXPERIMENTAL
     2.7  
     2.8  config ARCH_powerpc64
     2.9      select ARCH_64
     3.1 --- a/config/arch/sh.in	Sun Mar 22 22:49:44 2009 +0000
     3.2 +++ b/config/arch/sh.in	Sun Mar 22 23:04:57 2009 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  # Super-H specific configuration file
     3.5 -# EXPERIMENTAL
     3.6 +# depends on EXPERIMENTAL
     3.7  
     3.8  config ARCH_sh
     3.9      select ARCH_SUPPORTS_BOTH_ENDIAN
     4.1 --- a/config/config.mk	Sun Mar 22 22:49:44 2009 +0000
     4.2 +++ b/config/config.mk	Sun Mar 22 23:04:57 2009 +0000
     4.3 @@ -87,12 +87,10 @@
     4.4  	    _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;');        \
     4.5  	    echo "config $(3)_$${_entry}";                                      \
     4.6  	    echo "    bool";                                                    \
     4.7 -	    printf "    prompt \"$${entry}";                                    \
     4.8 -	    if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then   \
     4.9 -	      echo " (EXPERIMENTAL)\"";                                         \
    4.10 -	      echo "    depends on EXPERIMENTAL";                               \
    4.11 -	    else                                                                \
    4.12 -	      echo "\"";                                                        \
    4.13 +	    echo "    prompt \"$${entry}\"";                                    \
    4.14 +	    dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null);       \
    4.15 +	    if [ -n "$${dep_val}" ]; then                                       \
    4.16 +	      echo "    $${dep_val#\# }";                                       \
    4.17  	    fi;                                                                 \
    4.18  	    echo "";                                                            \
    4.19  	  done;                                                                 \
    4.20 @@ -134,12 +132,10 @@
    4.21  	    _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;');        \
    4.22  	    echo "menuconfig $(3)_$${_entry}";                                  \
    4.23  	    echo "    bool";                                                    \
    4.24 -	    printf "    prompt \"$${entry}";                                    \
    4.25 -	    if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then   \
    4.26 -	      echo " (EXPERIMENTAL)\"";                                         \
    4.27 -	      echo "    depends on EXPERIMENTAL";                               \
    4.28 -	    else                                                                \
    4.29 -	      echo "\"";                                                        \
    4.30 +	    echo "    prompt \"$${entry}\"";                                    \
    4.31 +	    dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null);       \
    4.32 +	    if [ -n "$${dep_val}" ]; then                                       \
    4.33 +	      echo "    $${dep_val#\# }";                                       \
    4.34  	    fi;                                                                 \
    4.35  	    echo "if $(3)_$${_entry}";                                          \
    4.36  	    echo "source $${file}";                                             \
     5.1 --- a/config/libc/eglibc.in	Sun Mar 22 22:49:44 2009 +0000
     5.2 +++ b/config/libc/eglibc.in	Sun Mar 22 23:04:57 2009 +0000
     5.3 @@ -1,5 +1,5 @@
     5.4  # eglibc options
     5.5 -# EXPERIMENTAL
     5.6 +# depends on EXPERIMENTAL
     5.7  
     5.8  config LIBC_eglibc
     5.9      select LIBC_SUPPORT_NPTL