# HG changeset patch # User "Yann E. MORIN" # Date 1232905994 0 # Node ID 218f7a0e8d717cd4449df6d45ab2cb6cb41fd562 # Parent df32ef8825f9a64d788f49519479d0322850b6dc 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 -r df32ef8825f9 -r 218f7a0e8d71 scripts/build/libc/glibc.sh --- a/scripts/build/libc/glibc.sh Tue Jan 20 20:37: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