From 2237fab53635ab7856d8752b7bf331d42416ab33 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 17 Apr 2008 21:04:23 +0000 Subject: Moving around the files in config/ broke the tools/addToolVersion.sh script. Fix that. /trunk/tools/addToolVersion.sh | 26 13 13 0 +++++++++++++------------- /trunk/config/kernel/linux.in | 6 3 3 0 +++--- /trunk/config/kernel.in | 2 1 1 0 +- /trunk/config/cc.in | 2 1 1 0 +- /trunk/config/libc.in | 4 2 2 0 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) --- config/libc/glibc.in | 124 +++++++++++++++++++++++++++++++++++++++++++++ config/libc/libc_glibc.in | 124 --------------------------------------------- config/libc/libc_uClibc.in | 101 ------------------------------------ config/libc/uClibc.in | 101 ++++++++++++++++++++++++++++++++++++ 4 files changed, 225 insertions(+), 225 deletions(-) create mode 100644 config/libc/glibc.in delete mode 100644 config/libc/libc_glibc.in delete mode 100644 config/libc/libc_uClibc.in create mode 100644 config/libc/uClibc.in (limited to 'config/libc') diff --git a/config/libc/glibc.in b/config/libc/glibc.in new file mode 100644 index 00000000..e4359b71 --- /dev/null +++ b/config/libc/glibc.in @@ -0,0 +1,124 @@ +# glibc options + +choice + bool + prompt "glibc version" + +config LIBC_V_2_3_6 + bool + prompt "2.3.6 (OBSOLETE)" + depends on OBSOLETE + +config LIBC_V_2_5 + bool + prompt "2.5" + +config LIBC_V_2_5_1 + bool + prompt "2.5.1" + +config LIBC_V_2_6 + bool + prompt "2.6" + +config LIBC_V_2_6_1 + bool + prompt "2.6.1" + +config LIBC_V_2_7 + bool + prompt "2.7" + depends on EXPERIMENTAL + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config LIBC_VERSION + string + default "2.3.6" if LIBC_V_2_3_6 + default "2.4" if LIBC_V_2_4 + default "2.5" if LIBC_V_2_5 + default "2.5.1" if LIBC_V_2_5_1 + default "2.6" if LIBC_V_2_6 + default "2.6.1" if LIBC_V_2_6_1 + default "2.7" if LIBC_V_2_7 +# CT_INSERT_VERSION_STRING_ABOVE +# Don't remove above line! + +config LIBC_GLIBC_EXTRA_CONFIG + string + prompt "glibc extra config" + default "" + help + Extra flags to pass onto ./configure when configuring glibc. + + Eg.: --enable-static-nss + +config LIBC_GLIBC_EXTRA_CFLAGS + string + prompt "glibc extra target CFLAGS" + default "" + help + Extra target CFLAGS to use when building glibc. + +config LIBC_EXTRA_CC_ARGS + string + prompt "gcc extra flags" + default "" + help + Extra flags to pass gcc when building glibc. + + Seldom used, except for sparc64 which seems to need the flag -64 + to be passed onto gcc. + +# Please note: This is not used for now (no sh support). +config LIBC_GLIBC_CONFIGPARMS + string + prompt "Extra config params (READ HELP)" + default "" if ARCH != "sh3" && ARCH != "sh4" + default "no-z-defs=yes" if ARCH = "sh3" || ARCH = "sh4" + help + Some architectures need to set options in the file configparms. + This is the case for sh3/4, which really need to set configparms as of + gcc-3.4/glibc-2.3.2. + + Unless you are building a toolchain for sh3/4, you should leave that empty. + + Note: this is awkward, doesn't work well if you need more than one + line in configparms + +config LIBC_GLIBC_USE_PORTS + bool + prompt "Use the ports addon" + default n + help + The ports addon contains some architecture ports that are not available + in the official glibc distribution. + + For example, this is the case for ARM with glibc >= 2.4 + + Say n only if you're sure that your architecture is in the official + glibc distribution for your chosen version. + +config LIBC_ADDONS + bool + prompt "Pass extra addons list" + default n + help + If you say Y here, you'll be able to give the list of addons you want to + include in your C library. + +config LIBC_ADDONS_LIST + string + prompt "Extra addons" + default "" + depends on LIBC_ADDONS + help + Extra addons to include in glibc. Space separated list. + + You need to specify neither linuxthreads nor nptl, as they are added + automagically for you depending on the threading model you choosed + earlier. + + Eg.: crypt (for very old glibces) diff --git a/config/libc/libc_glibc.in b/config/libc/libc_glibc.in deleted file mode 100644 index e4359b71..00000000 --- a/config/libc/libc_glibc.in +++ /dev/null @@ -1,124 +0,0 @@ -# glibc options - -choice - bool - prompt "glibc version" - -config LIBC_V_2_3_6 - bool - prompt "2.3.6 (OBSOLETE)" - depends on OBSOLETE - -config LIBC_V_2_5 - bool - prompt "2.5" - -config LIBC_V_2_5_1 - bool - prompt "2.5.1" - -config LIBC_V_2_6 - bool - prompt "2.6" - -config LIBC_V_2_6_1 - bool - prompt "2.6.1" - -config LIBC_V_2_7 - bool - prompt "2.7" - depends on EXPERIMENTAL - -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! -endchoice - -config LIBC_VERSION - string - default "2.3.6" if LIBC_V_2_3_6 - default "2.4" if LIBC_V_2_4 - default "2.5" if LIBC_V_2_5 - default "2.5.1" if LIBC_V_2_5_1 - default "2.6" if LIBC_V_2_6 - default "2.6.1" if LIBC_V_2_6_1 - default "2.7" if LIBC_V_2_7 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! - -config LIBC_GLIBC_EXTRA_CONFIG - string - prompt "glibc extra config" - default "" - help - Extra flags to pass onto ./configure when configuring glibc. - - Eg.: --enable-static-nss - -config LIBC_GLIBC_EXTRA_CFLAGS - string - prompt "glibc extra target CFLAGS" - default "" - help - Extra target CFLAGS to use when building glibc. - -config LIBC_EXTRA_CC_ARGS - string - prompt "gcc extra flags" - default "" - help - Extra flags to pass gcc when building glibc. - - Seldom used, except for sparc64 which seems to need the flag -64 - to be passed onto gcc. - -# Please note: This is not used for now (no sh support). -config LIBC_GLIBC_CONFIGPARMS - string - prompt "Extra config params (READ HELP)" - default "" if ARCH != "sh3" && ARCH != "sh4" - default "no-z-defs=yes" if ARCH = "sh3" || ARCH = "sh4" - help - Some architectures need to set options in the file configparms. - This is the case for sh3/4, which really need to set configparms as of - gcc-3.4/glibc-2.3.2. - - Unless you are building a toolchain for sh3/4, you should leave that empty. - - Note: this is awkward, doesn't work well if you need more than one - line in configparms - -config LIBC_GLIBC_USE_PORTS - bool - prompt "Use the ports addon" - default n - help - The ports addon contains some architecture ports that are not available - in the official glibc distribution. - - For example, this is the case for ARM with glibc >= 2.4 - - Say n only if you're sure that your architecture is in the official - glibc distribution for your chosen version. - -config LIBC_ADDONS - bool - prompt "Pass extra addons list" - default n - help - If you say Y here, you'll be able to give the list of addons you want to - include in your C library. - -config LIBC_ADDONS_LIST - string - prompt "Extra addons" - default "" - depends on LIBC_ADDONS - help - Extra addons to include in glibc. Space separated list. - - You need to specify neither linuxthreads nor nptl, as they are added - automagically for you depending on the threading model you choosed - earlier. - - Eg.: crypt (for very old glibces) diff --git a/config/libc/libc_uClibc.in b/config/libc/libc_uClibc.in deleted file mode 100644 index 4f9943dc..00000000 --- a/config/libc/libc_uClibc.in +++ /dev/null @@ -1,101 +0,0 @@ -# uClibc options - -choice - bool - prompt "uClibc version" - -config LIBC_V_snapshot - bool - prompt "latest snapshot" - -config LIBC_V_specific_date - bool - prompt "" - -config LIBC_V_0_9_28 - bool - prompt "0.9.28 (OBSOLETE)" - depends on OBSOLETE - -config LIBC_V_0_9_28_1 - bool - prompt "0.9.28.1 (OBSOLETE)" - depends on OBSOLETE - -config LIBC_V_0_9_28_2 - bool - prompt "0.9.28.2 (OBSOLETE)" - depends on OBSOLETE - -config LIBC_V_0_9_28_3 - bool - prompt "0.9.28.3" - -config LIBC_V_0_9_29 - bool - prompt "0.9.29" - -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! -endchoice - -config LIBC_VERSION - string - prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date - default "snapshot" if LIBC_V_snapshot - default "0.9.28" if LIBC_V_0_9_28 - default "0.9.28.1" if LIBC_V_0_9_28_1 - default "0.9.28.2" if LIBC_V_0_9_28_2 - default "0.9.28.3" if LIBC_V_0_9_28_3 - default "0.9.29" if LIBC_V_0_9_29 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! - help - Enter the date of the snapshot you want to use in the form: YYYYMMDD - where YYYY is the 4-digit year, MM the 2-digit month and DD the 2-digit - day in the month. - - Please note that uClibc site removes snapshots older than a month. - -choice - bool - prompt "Debug level" - default LIBC_UCLIBC_DEBUG_LEVEL_0 - -config LIBC_UCLIBC_DEBUG_LEVEL_0 - bool - prompt "none" - -config LIBC_UCLIBC_DEBUG_LEVEL_1 - bool - prompt "minimal" - -config LIBC_UCLIBC_DEBUG_LEVEL_2 - bool - prompt "all" - -endchoice - -config LIBC_UCLIBC_DEBUG_LEVEL - int - default 0 if LIBC_UCLIBC_DEBUG_LEVEL_0 - default 1 if LIBC_UCLIBC_DEBUG_LEVEL_1 - default 2 if LIBC_UCLIBC_DEBUG_LEVEL_2 - -config LIBC_UCLIBC_CONFIG_FILE - string - prompt "Configuration file" - default "" - help - Path to the configuration file. - - You _must_ provide one (for now). - -config LIBC_UCLIBC_LOCALES - bool - prompt "Add support for locales" - default n - help - Say y if you want uClibc to support localisation. - - Note that seems to be broken on recent uClibc releases. diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in new file mode 100644 index 00000000..4f9943dc --- /dev/null +++ b/config/libc/uClibc.in @@ -0,0 +1,101 @@ +# uClibc options + +choice + bool + prompt "uClibc version" + +config LIBC_V_snapshot + bool + prompt "latest snapshot" + +config LIBC_V_specific_date + bool + prompt "" + +config LIBC_V_0_9_28 + bool + prompt "0.9.28 (OBSOLETE)" + depends on OBSOLETE + +config LIBC_V_0_9_28_1 + bool + prompt "0.9.28.1 (OBSOLETE)" + depends on OBSOLETE + +config LIBC_V_0_9_28_2 + bool + prompt "0.9.28.2 (OBSOLETE)" + depends on OBSOLETE + +config LIBC_V_0_9_28_3 + bool + prompt "0.9.28.3" + +config LIBC_V_0_9_29 + bool + prompt "0.9.29" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config LIBC_VERSION + string + prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date + default "snapshot" if LIBC_V_snapshot + default "0.9.28" if LIBC_V_0_9_28 + default "0.9.28.1" if LIBC_V_0_9_28_1 + default "0.9.28.2" if LIBC_V_0_9_28_2 + default "0.9.28.3" if LIBC_V_0_9_28_3 + default "0.9.29" if LIBC_V_0_9_29 +# CT_INSERT_VERSION_STRING_ABOVE +# Don't remove above line! + help + Enter the date of the snapshot you want to use in the form: YYYYMMDD + where YYYY is the 4-digit year, MM the 2-digit month and DD the 2-digit + day in the month. + + Please note that uClibc site removes snapshots older than a month. + +choice + bool + prompt "Debug level" + default LIBC_UCLIBC_DEBUG_LEVEL_0 + +config LIBC_UCLIBC_DEBUG_LEVEL_0 + bool + prompt "none" + +config LIBC_UCLIBC_DEBUG_LEVEL_1 + bool + prompt "minimal" + +config LIBC_UCLIBC_DEBUG_LEVEL_2 + bool + prompt "all" + +endchoice + +config LIBC_UCLIBC_DEBUG_LEVEL + int + default 0 if LIBC_UCLIBC_DEBUG_LEVEL_0 + default 1 if LIBC_UCLIBC_DEBUG_LEVEL_1 + default 2 if LIBC_UCLIBC_DEBUG_LEVEL_2 + +config LIBC_UCLIBC_CONFIG_FILE + string + prompt "Configuration file" + default "" + help + Path to the configuration file. + + You _must_ provide one (for now). + +config LIBC_UCLIBC_LOCALES + bool + prompt "Add support for locales" + default n + help + Say y if you want uClibc to support localisation. + + Note that seems to be broken on recent uClibc releases. -- cgit v1.2.3