diff -r 1ab3d2e08c8b -r 218f7a0e8d71 scripts/build/libc/glibc.sh --- a/scripts/build/libc/glibc.sh Mon Jan 05 23:02:43 2009 +0000 +++ b/scripts/build/libc/glibc.sh Sun Jan 25 17:53:14 2009 +0000 @@ -264,8 +264,8 @@ extra_config="${extra_config} $(do_libc_min_kernel_config)" # Add some default CC args - glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') - glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\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/') # 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 @@ -376,8 +376,8 @@ extra_config="${extra_config} $(do_libc_min_kernel_config)" # Add some default CC args - glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') - glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\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/') # 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