From 1007fb528d8b7d42f0722966eb258d1fa8e595b2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 25 Jan 2009 17:53:14 +0000 Subject: On 20090120.2203+0100, Andy Johnson wrote: The glibc.sh script doesn't handle the glibc versions with an underscore very well (bash expected integer error). I have attached a small patch for that. Instead of looking for "not period" I changed the sense to look for numbers. I initially tried to make it look for either a period or an underscore, but that didn't work like I wanted (probably because I did something wrong). Original patch modified to be more robust. /trunk/scripts/build/libc/glibc.sh | 8 4 4 0 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index b56905e..19283a8 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -264,8 +264,8 @@ do_libc_start_files() { 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 @@ do_libc() { 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 -- cgit v0.10.2-6-g49f6