From e46e74546d3f9f89aa0ccf369f434049e62b1620 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 30 Jan 2010 16:19:50 +0100 Subject: libc/glibc: fix retrieving version string diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 43beb3e..233cd3b 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -377,8 +377,11 @@ do_libc() { 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. -- cgit v0.10.2-6-g49f6