diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-01-25 17:53:14 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-01-25 17:53:14 (GMT) |
| commit | 1007fb528d8b7d42f0722966eb258d1fa8e595b2 (patch) | |
| tree | 2d3443a160c2f339d588c6b7053f58d37f93b950 /scripts | |
| parent | 1115b43f868e1802da67a193a84428af5b958607 (diff) | |
On 20090120.2203+0100, Andy Johnson <ajohnson@aecno.com> 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(-)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/libc/glibc.sh | 8 |
1 files 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 |