mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-20 17:12:55 +00:00
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(-)
This commit is contained in:
Yann E. MORIN"
parent
9dd85f517a
commit
b3f5a87080
1
config/libc/eglibc-glibc-common.in
Symbolic link
1
config/libc/eglibc-glibc-common.in
Symbolic link
@ -0,0 +1 @@
|
||||
glibc-eglibc-common.in
|
||||
@ -69,63 +69,4 @@ config EGLIBC_CHECKOUT
|
||||
Note that crosstool-NG will *not* update your working copy, you will
|
||||
have to do that yourself.
|
||||
|
||||
config LIBC_EGLIBC_EXTRA_CONFIG
|
||||
string
|
||||
prompt "eglibc extra config"
|
||||
default ""
|
||||
help
|
||||
Extra flags to pass onto ./configure when configuring eglibc.
|
||||
|
||||
Eg.: --enable-static-nss
|
||||
|
||||
config LIBC_EGLIBC_EXTRA_CFLAGS
|
||||
string
|
||||
prompt "eglibc extra target CFLAGS"
|
||||
default ""
|
||||
help
|
||||
Extra target CFLAGS to use when building eglibc.
|
||||
|
||||
config LIBC_EXTRA_CC_ARGS
|
||||
string
|
||||
prompt "gcc extra flags"
|
||||
default ""
|
||||
help
|
||||
Extra flags to pass gcc when building eglibc.
|
||||
|
||||
Seldom used, except for sparc64 which seems to need the flag -64
|
||||
to be passed onto gcc.
|
||||
|
||||
config LIBC_EGLIBC_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 eglibc. 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)
|
||||
source config/libc/eglibc-glibc-common.in
|
||||
|
||||
69
config/libc/glibc-eglibc-common.in
Normal file
69
config/libc/glibc-eglibc-common.in
Normal file
@ -0,0 +1,69 @@
|
||||
# This file contains the common configuration options
|
||||
# that apply to both glibc and eglibc.
|
||||
#
|
||||
# Please note:
|
||||
# the symlink is a hack around the fact that mconf can not parse
|
||||
# the same file more than once, and errors out if it is the case.
|
||||
# If mconf is updated to accept multiple inclusion of the same
|
||||
# file, then the symlink can go (and the includers be updated).
|
||||
|
||||
config LIBC_GLIBC_EXTRA_CONFIG
|
||||
string
|
||||
prompt "extra config"
|
||||
default ""
|
||||
help
|
||||
Extra flags to pass onto ./configure when configuring.
|
||||
|
||||
Eg.: --enable-static-nss
|
||||
|
||||
config LIBC_GLIBC_EXTRA_CFLAGS
|
||||
string
|
||||
prompt "extra target CFLAGS"
|
||||
default ""
|
||||
help
|
||||
Extra target CFLAGS to use when building.
|
||||
|
||||
config LIBC_EXTRA_CC_ARGS
|
||||
string
|
||||
prompt "gcc extra flags"
|
||||
default ""
|
||||
help
|
||||
Extra flags to pass gcc when building.
|
||||
|
||||
Seldom used, except for sparc64 which seems to need the flag -64
|
||||
to be passed onto gcc.
|
||||
|
||||
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 distribution.
|
||||
|
||||
For example, this is the case for ARM with for 2.4 and above.
|
||||
|
||||
Say n only if you're sure that your architecture is in the official
|
||||
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. 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 libces)
|
||||
@ -58,36 +58,10 @@ config LIBC_VERSION
|
||||
# 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)"
|
||||
# prompt "Extra config params (READ HELP)"
|
||||
default "" if ARCH != "sh3" && ARCH != "sh4"
|
||||
default "no-z-defs=yes" if ARCH = "sh3" || ARCH = "sh4"
|
||||
help
|
||||
@ -100,37 +74,4 @@ config LIBC_GLIBC_CONFIGPARMS
|
||||
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)
|
||||
source config/libc/glibc-eglibc-common.in
|
||||
|
||||
@ -204,7 +204,7 @@ do_libc() {
|
||||
nptl) extra_config="${extra_config} --with-__thread --with-tls";;
|
||||
linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";;
|
||||
none) extra_config="${extra_config} --without-__thread --without-nptl"
|
||||
case "${CT_LIBC_EGLIBC_EXTRA_CONFIG}" in
|
||||
case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
|
||||
*-tls*) ;;
|
||||
*) extra_config="${extra_config} --without-tls";;
|
||||
esac
|
||||
@ -236,7 +236,7 @@ do_libc() {
|
||||
CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
|
||||
|
||||
BUILD_CC=${CT_CC_NATIVE} \
|
||||
CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_EGLIBC_EXTRA_CFLAGS} -O" \
|
||||
CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \
|
||||
CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
|
||||
AR=${CT_TARGET}-ar \
|
||||
RANLIB=${CT_TARGET}-ranlib \
|
||||
@ -250,7 +250,7 @@ do_libc() {
|
||||
--without-gd \
|
||||
--without-cvs \
|
||||
${extra_config} \
|
||||
${CT_LIBC_EGLIBC_EXTRA_CONFIG}
|
||||
${CT_LIBC_GLIBC_EXTRA_CONFIG}
|
||||
|
||||
CT_DoLog EXTRA "Building C library"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user