ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-20 17:12:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

On 20090120.2203+0100, Andy Johnson <ajohnson@aecno.com> wrote:

Browse Source 
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(-)
This commit is contained in:
Yann E. MORIN" 2009-01-25 17:53:14 +00:00
parent 1115b43f86
commit 1007fb528d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/libc/glibc.sh
View File

@ -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