Re: Various patches

["Yann E. MORIN" <yann dot morin dot 1998 at anciens dot enib dot fr>]

Andy,
All,

On Tuesday 20 January 2009 22:03:19 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).

What about this one?

Regards,
Yann E. MORIN.

Index: ct-ng.trunk/scripts/build/libc/glibc.sh
===================================================================
--- ct-ng.trunk/scripts/build/libc/glibc.sh     (revision 1317)
+++ ct-ng.trunk/scripts/build/libc/glibc.sh     (working copy)
@@ -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

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +0/33 662376056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| --==< ^_^ >==-- `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
`------------------------------^-------^------------------^--------------------'


--
For unsubscribe information see http://sourceware.org/lists.html#faq