1.1 --- a/config/libc/glibc.in Fri Oct 02 00:04:24 2009 +0200
1.2 +++ b/config/libc/glibc.in Sat Oct 03 18:19:39 2009 +0200
1.3 @@ -49,21 +49,10 @@
1.4 prompt "2.3.6 (OBSOLETE)"
1.5 depends on OBSOLETE
1.6
1.7 -config LIBC_V_LATEST
1.8 - bool
1.9 - prompt "'latest' snapshot (EXPERIMENTAL)"
1.10 - depends on EXPERIMENTAL
1.11 -
1.12 -config LIBC_V_date
1.13 - bool
1.14 - prompt "<specific date> (EXPERIMENTAL)"
1.15 - depends on EXPERIMENTAL
1.16 -
1.17 endchoice
1.18
1.19 config LIBC_VERSION
1.20 string
1.21 - prompt "Enter date (YYYYMMDD)" if LIBC_V_date
1.22 # Don't remove next line
1.23 # CT_INSERT_VERSION_STRING_BELOW
1.24 default "2.9" if LIBC_V_2_9
1.25 @@ -74,7 +63,6 @@
1.26 default "2.5.1" if LIBC_V_2_5_1
1.27 default "2.5" if LIBC_V_2_5
1.28 default "2.3.6" if LIBC_V_2_3_6
1.29 - default "latest" if LIBC_V_LATEST
1.30
1.31 config LIBC_GLIBC_2_8_or_later
1.32 bool
2.1 --- a/scripts/build/libc/glibc.sh Fri Oct 02 00:04:24 2009 +0200
2.2 +++ b/scripts/build/libc/glibc.sh Sat Oct 03 18:19:39 2009 +0200
2.3 @@ -292,12 +292,6 @@
2.4 # Add some default CC args
2.5 glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
2.6 glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
2.7 - # In case we're using a snapshot, fake a >=2.6 version.
2.8 - if [ "${CT_LIBC_V_LATEST}" = "y" \
2.9 - -o "${CT_LIBC_V_date}" = "y" ]; then
2.10 - glibc_version_major=3
2.11 - glibc_version_minor=0
2.12 - fi
2.13 if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \
2.14 -o ${glibc_version_major} -gt 2 ]; then
2.15 # Don't use -pipe: configure chokes on it for glibc >= 2.6.
2.16 @@ -407,12 +401,6 @@
2.17 # Add some default CC args
2.18 glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
2.19 glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
2.20 - # In case we're using a snapshot, fake a >=2.6 version.
2.21 - if [ "${CT_LIBC_V_LATEST}" = "y" \
2.22 - -o "${CT_LIBC_V_date}" = "y" ]; then
2.23 - glibc_version_major=3
2.24 - glibc_version_minor=0
2.25 - fi
2.26 if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \
2.27 -o ${glibc_version_major} -gt 2 ]; then
2.28 # Don't use -pipe: configure chokes on it for glibc >= 2.6.