Commonalise options common to both glibc and eglibc.
/trunk/scripts/build/libc_eglibc.sh | 6 3 3 0 +-
/trunk/config/libc/glibc.in | 63 2 61 0 +---------------------------------
/trunk/config/libc/eglibc.in | 61 1 60 0 +--------------------------------
/trunk/config/libc/eglibc-glibc-common.in | 1 1 0 0 +
/trunk/config/libc/glibc-eglibc-common.in | 69 69 0 0 +++++++++++++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 124 deletions(-)
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/config/libc/eglibc-glibc-common.in Tue Aug 26 16:47:47 2008 +0000
1.3 @@ -0,0 +1,1 @@
1.4 +glibc-eglibc-common.in
1.5 \ No newline at end of file
2.1 --- a/config/libc/eglibc.in Mon Aug 25 21:42:34 2008 +0000
2.2 +++ b/config/libc/eglibc.in Tue Aug 26 16:47:47 2008 +0000
2.3 @@ -69,63 +69,4 @@
2.4 Note that crosstool-NG will *not* update your working copy, you will
2.5 have to do that yourself.
2.6
2.7 -config LIBC_EGLIBC_EXTRA_CONFIG
2.8 - string
2.9 - prompt "eglibc extra config"
2.10 - default ""
2.11 - help
2.12 - Extra flags to pass onto ./configure when configuring eglibc.
2.13 -
2.14 - Eg.: --enable-static-nss
2.15 -
2.16 -config LIBC_EGLIBC_EXTRA_CFLAGS
2.17 - string
2.18 - prompt "eglibc extra target CFLAGS"
2.19 - default ""
2.20 - help
2.21 - Extra target CFLAGS to use when building eglibc.
2.22 -
2.23 -config LIBC_EXTRA_CC_ARGS
2.24 - string
2.25 - prompt "gcc extra flags"
2.26 - default ""
2.27 - help
2.28 - Extra flags to pass gcc when building eglibc.
2.29 -
2.30 - Seldom used, except for sparc64 which seems to need the flag -64
2.31 - to be passed onto gcc.
2.32 -
2.33 -config LIBC_EGLIBC_USE_PORTS
2.34 - bool
2.35 - prompt "Use the ports addon"
2.36 - default n
2.37 - help
2.38 - The ports addon contains some architecture ports that are not available
2.39 - in the official glibc distribution.
2.40 -
2.41 - For example, this is the case for ARM with glibc >= 2.4
2.42 -
2.43 - Say n only if you're sure that your architecture is in the official
2.44 - glibc distribution for your chosen version.
2.45 -
2.46 -config LIBC_ADDONS
2.47 - bool
2.48 - prompt "Pass extra addons list"
2.49 - default n
2.50 - help
2.51 - If you say Y here, you'll be able to give the list of addons you want to
2.52 - include in your C library.
2.53 -
2.54 -config LIBC_ADDONS_LIST
2.55 - string
2.56 - prompt "Extra addons"
2.57 - default ""
2.58 - depends on LIBC_ADDONS
2.59 - help
2.60 - Extra addons to include in eglibc. Space separated list.
2.61 -
2.62 - You need to specify neither linuxthreads nor nptl, as they are added
2.63 - automagically for you depending on the threading model you choosed
2.64 - earlier.
2.65 -
2.66 - Eg.: crypt (for very old glibces)
2.67 +source config/libc/eglibc-glibc-common.in
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/config/libc/glibc-eglibc-common.in Tue Aug 26 16:47:47 2008 +0000
3.3 @@ -0,0 +1,69 @@
3.4 +# This file contains the common configuration options
3.5 +# that apply to both glibc and eglibc.
3.6 +#
3.7 +# Please note:
3.8 +# the symlink is a hack around the fact that mconf can not parse
3.9 +# the same file more than once, and errors out if it is the case.
3.10 +# If mconf is updated to accept multiple inclusion of the same
3.11 +# file, then the symlink can go (and the includers be updated).
3.12 +
3.13 +config LIBC_GLIBC_EXTRA_CONFIG
3.14 + string
3.15 + prompt "extra config"
3.16 + default ""
3.17 + help
3.18 + Extra flags to pass onto ./configure when configuring.
3.19 +
3.20 + Eg.: --enable-static-nss
3.21 +
3.22 +config LIBC_GLIBC_EXTRA_CFLAGS
3.23 + string
3.24 + prompt "extra target CFLAGS"
3.25 + default ""
3.26 + help
3.27 + Extra target CFLAGS to use when building.
3.28 +
3.29 +config LIBC_EXTRA_CC_ARGS
3.30 + string
3.31 + prompt "gcc extra flags"
3.32 + default ""
3.33 + help
3.34 + Extra flags to pass gcc when building.
3.35 +
3.36 + Seldom used, except for sparc64 which seems to need the flag -64
3.37 + to be passed onto gcc.
3.38 +
3.39 +config LIBC_GLIBC_USE_PORTS
3.40 + bool
3.41 + prompt "Use the ports addon"
3.42 + default n
3.43 + help
3.44 + The ports addon contains some architecture ports that are not available
3.45 + in the official distribution.
3.46 +
3.47 + For example, this is the case for ARM with for 2.4 and above.
3.48 +
3.49 + Say n only if you're sure that your architecture is in the official
3.50 + distribution for your chosen version.
3.51 +
3.52 +config LIBC_ADDONS
3.53 + bool
3.54 + prompt "Pass extra addons list"
3.55 + default n
3.56 + help
3.57 + If you say Y here, you'll be able to give the list of addons you want to
3.58 + include in your C library.
3.59 +
3.60 +config LIBC_ADDONS_LIST
3.61 + string
3.62 + prompt "Extra addons"
3.63 + default ""
3.64 + depends on LIBC_ADDONS
3.65 + help
3.66 + Extra addons to include. Space separated list.
3.67 +
3.68 + You need to specify neither linuxthreads nor nptl, as they are added
3.69 + automagically for you depending on the threading model you choosed
3.70 + earlier.
3.71 +
3.72 + Eg.: crypt (for very old libces)
4.1 --- a/config/libc/glibc.in Mon Aug 25 21:42:34 2008 +0000
4.2 +++ b/config/libc/glibc.in Tue Aug 26 16:47:47 2008 +0000
4.3 @@ -58,36 +58,10 @@
4.4 # CT_INSERT_VERSION_STRING_ABOVE
4.5 # Don't remove above line!
4.6
4.7 -config LIBC_GLIBC_EXTRA_CONFIG
4.8 - string
4.9 - prompt "glibc extra config"
4.10 - default ""
4.11 - help
4.12 - Extra flags to pass onto ./configure when configuring glibc.
4.13 -
4.14 - Eg.: --enable-static-nss
4.15 -
4.16 -config LIBC_GLIBC_EXTRA_CFLAGS
4.17 - string
4.18 - prompt "glibc extra target CFLAGS"
4.19 - default ""
4.20 - help
4.21 - Extra target CFLAGS to use when building glibc.
4.22 -
4.23 -config LIBC_EXTRA_CC_ARGS
4.24 - string
4.25 - prompt "gcc extra flags"
4.26 - default ""
4.27 - help
4.28 - Extra flags to pass gcc when building glibc.
4.29 -
4.30 - Seldom used, except for sparc64 which seems to need the flag -64
4.31 - to be passed onto gcc.
4.32 -
4.33 # Please note: This is not used for now (no sh support).
4.34 config LIBC_GLIBC_CONFIGPARMS
4.35 string
4.36 - prompt "Extra config params (READ HELP)"
4.37 +# prompt "Extra config params (READ HELP)"
4.38 default "" if ARCH != "sh3" && ARCH != "sh4"
4.39 default "no-z-defs=yes" if ARCH = "sh3" || ARCH = "sh4"
4.40 help
4.41 @@ -100,37 +74,4 @@
4.42 Note: this is awkward, doesn't work well if you need more than one
4.43 line in configparms
4.44
4.45 -config LIBC_GLIBC_USE_PORTS
4.46 - bool
4.47 - prompt "Use the ports addon"
4.48 - default n
4.49 - help
4.50 - The ports addon contains some architecture ports that are not available
4.51 - in the official glibc distribution.
4.52 -
4.53 - For example, this is the case for ARM with glibc >= 2.4
4.54 -
4.55 - Say n only if you're sure that your architecture is in the official
4.56 - glibc distribution for your chosen version.
4.57 -
4.58 -config LIBC_ADDONS
4.59 - bool
4.60 - prompt "Pass extra addons list"
4.61 - default n
4.62 - help
4.63 - If you say Y here, you'll be able to give the list of addons you want to
4.64 - include in your C library.
4.65 -
4.66 -config LIBC_ADDONS_LIST
4.67 - string
4.68 - prompt "Extra addons"
4.69 - default ""
4.70 - depends on LIBC_ADDONS
4.71 - help
4.72 - Extra addons to include in glibc. Space separated list.
4.73 -
4.74 - You need to specify neither linuxthreads nor nptl, as they are added
4.75 - automagically for you depending on the threading model you choosed
4.76 - earlier.
4.77 -
4.78 - Eg.: crypt (for very old glibces)
4.79 +source config/libc/glibc-eglibc-common.in
5.1 --- a/scripts/build/libc_eglibc.sh Mon Aug 25 21:42:34 2008 +0000
5.2 +++ b/scripts/build/libc_eglibc.sh Tue Aug 26 16:47:47 2008 +0000
5.3 @@ -204,7 +204,7 @@
5.4 nptl) extra_config="${extra_config} --with-__thread --with-tls";;
5.5 linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";;
5.6 none) extra_config="${extra_config} --without-__thread --without-nptl"
5.7 - case "${CT_LIBC_EGLIBC_EXTRA_CONFIG}" in
5.8 + case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
5.9 *-tls*) ;;
5.10 *) extra_config="${extra_config} --without-tls";;
5.11 esac
5.12 @@ -236,7 +236,7 @@
5.13 CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
5.14
5.15 BUILD_CC=${CT_CC_NATIVE} \
5.16 - CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_EGLIBC_EXTRA_CFLAGS} -O" \
5.17 + CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \
5.18 CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
5.19 AR=${CT_TARGET}-ar \
5.20 RANLIB=${CT_TARGET}-ranlib \
5.21 @@ -250,7 +250,7 @@
5.22 --without-gd \
5.23 --without-cvs \
5.24 ${extra_config} \
5.25 - ${CT_LIBC_EGLIBC_EXTRA_CONFIG}
5.26 + ${CT_LIBC_GLIBC_EXTRA_CONFIG}
5.27
5.28 CT_DoLog EXTRA "Building C library"
5.29