libc/glibc: don't use legacy snapshots

glibc snapshots have not been updated for about the
past 5 months. Consider them to be deprecated, now.
This commit is contained in:
Yann E. MORIN" 2009-10-03 18:19:39 +02:00
parent b586e9ce72
commit d0c5d174bf
2 changed files with 0 additions and 24 deletions

View File

@ -49,21 +49,10 @@ config LIBC_V_2_3_6
prompt "2.3.6 (OBSOLETE)" prompt "2.3.6 (OBSOLETE)"
depends on OBSOLETE depends on OBSOLETE
config LIBC_V_LATEST
bool
prompt "'latest' snapshot (EXPERIMENTAL)"
depends on EXPERIMENTAL
config LIBC_V_date
bool
prompt "<specific date> (EXPERIMENTAL)"
depends on EXPERIMENTAL
endchoice endchoice
config LIBC_VERSION config LIBC_VERSION
string string
prompt "Enter date (YYYYMMDD)" if LIBC_V_date
# Don't remove next line # Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW # CT_INSERT_VERSION_STRING_BELOW
default "2.9" if LIBC_V_2_9 default "2.9" if LIBC_V_2_9
@ -74,7 +63,6 @@ config LIBC_VERSION
default "2.5.1" if LIBC_V_2_5_1 default "2.5.1" if LIBC_V_2_5_1
default "2.5" if LIBC_V_2_5 default "2.5" if LIBC_V_2_5
default "2.3.6" if LIBC_V_2_3_6 default "2.3.6" if LIBC_V_2_3_6
default "latest" if LIBC_V_LATEST
config LIBC_GLIBC_2_8_or_later config LIBC_GLIBC_2_8_or_later
bool bool

View File

@ -292,12 +292,6 @@ do_libc_start_files() {
# Add some default CC args # Add some default CC args
glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/') glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
# In case we're using a snapshot, fake a >=2.6 version.
if [ "${CT_LIBC_V_LATEST}" = "y" \
-o "${CT_LIBC_V_date}" = "y" ]; then
glibc_version_major=3
glibc_version_minor=0
fi
if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \
-o ${glibc_version_major} -gt 2 ]; then -o ${glibc_version_major} -gt 2 ]; then
# Don't use -pipe: configure chokes on it for glibc >= 2.6. # Don't use -pipe: configure chokes on it for glibc >= 2.6.
@ -407,12 +401,6 @@ do_libc() {
# Add some default CC args # Add some default CC args
glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/') glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
# In case we're using a snapshot, fake a >=2.6 version.
if [ "${CT_LIBC_V_LATEST}" = "y" \
-o "${CT_LIBC_V_date}" = "y" ]; then
glibc_version_major=3
glibc_version_minor=0
fi
if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \
-o ${glibc_version_major} -gt 2 ]; then -o ${glibc_version_major} -gt 2 ]; then
# Don't use -pipe: configure chokes on it for glibc >= 2.6. # Don't use -pipe: configure chokes on it for glibc >= 2.6.