patches/glibc/2.9/600-recent-binutils.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
child 1967 9d6f3c433257
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate.
     1 diff -r -u glibc-cvs-2.9.orig/configure glibc-cvs-2.9/configure
     2 --- glibc-cvs-2.9.orig/configure	2008-11-11 01:50:11.000000000 -0800
     3 +++ glibc-cvs-2.9/configure	2009-11-24 17:52:27.000000000 -0800
     4 @@ -4531,7 +4531,7 @@
     5    ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     6    case $ac_prog_version in
     7      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
     8 -    2.1[3-9]*)
     9 +    2.1[3-9]*|2.20)
    10         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
    11      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
    12  
    13 @@ -4594,7 +4594,7 @@
    14    ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
    15    case $ac_prog_version in
    16      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
    17 -    2.1[3-9]*)
    18 +    2.1[3-9]*|2.20)
    19         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
    20      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
    21  
    22 diff -r -u glibc-cvs-2.9.orig/configure.in glibc-cvs-2.9/configure.in
    23 --- glibc-cvs-2.9.orig/configure.in	2008-11-11 01:50:11.000000000 -0800
    24 +++ glibc-cvs-2.9/configure.in	2009-11-24 17:53:35.000000000 -0800
    25 @@ -844,10 +844,10 @@
    26  # Accept binutils 2.13 or newer.
    27  AC_CHECK_PROG_VER(AS, $AS, --version,
    28  		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
    29 -		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
    30 +		  [2.1[3-9]*|2.20], AS=: critic_missing="$critic_missing as")
    31  AC_CHECK_PROG_VER(LD, $LD, --version,
    32  		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
    33 -		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
    34 +		  [2.1[3-9]*|2.20], LD=: critic_missing="$critic_missing ld")
    35  
    36  # We need the physical current working directory.  We cannot use the
    37  # "pwd -P" shell builtin since that's not portable.  Instead we try to