# HG changeset patch # User "Yann E. MORIN" # Date 1264864790 -3600 # Node ID e4d145e75e54f9e28b7d68ae90e459cecf58d1c1 # Parent fb0b4601f9992c912894ea4b62906e5259400c48 libc/glibc: fix retrieving version string diff -r fb0b4601f999 -r e4d145e75e54 scripts/build/libc/glibc.sh --- a/scripts/build/libc/glibc.sh Thu Jan 14 20:54:47 2010 +0100 +++ b/scripts/build/libc/glibc.sh Sat Jan 30 16:19:50 2010 +0100 @@ -377,8 +377,11 @@ extra_config+=("$(do_libc_min_kernel_config)") # Add some default CC args - 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="$( grep -E '\' "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/version.h" \ + |cut -d '"' -f 2 + )" + glibc_version_major=$(echo ${glibc_version} |sed -r -e 's/^([[:digit:]]+).*/\1/') + glibc_version_minor=$(echo ${glibc_version} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ -o ${glibc_version_major} -gt 2 ]; then # Don't use -pipe: configure chokes on it for glibc >= 2.6.