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.
fr@1654
     1
diff -r -u glibc-cvs-2.9.orig/configure glibc-cvs-2.9/configure
fr@1654
     2
--- glibc-cvs-2.9.orig/configure	2008-11-11 01:50:11.000000000 -0800
fr@1654
     3
+++ glibc-cvs-2.9/configure	2009-11-24 17:52:27.000000000 -0800
fr@1654
     4
@@ -4531,7 +4531,7 @@
fr@1654
     5
   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
fr@1654
     6
   case $ac_prog_version in
fr@1654
     7
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
fr@1654
     8
-    2.1[3-9]*)
fr@1654
     9
+    2.1[3-9]*|2.20)
fr@1654
    10
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
fr@1654
    11
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
fr@1654
    12
 
fr@1654
    13
@@ -4594,7 +4594,7 @@
fr@1654
    14
   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
fr@1654
    15
   case $ac_prog_version in
fr@1654
    16
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
fr@1654
    17
-    2.1[3-9]*)
fr@1654
    18
+    2.1[3-9]*|2.20)
fr@1654
    19
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
fr@1654
    20
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
fr@1654
    21
 
fr@1654
    22
diff -r -u glibc-cvs-2.9.orig/configure.in glibc-cvs-2.9/configure.in
fr@1654
    23
--- glibc-cvs-2.9.orig/configure.in	2008-11-11 01:50:11.000000000 -0800
fr@1654
    24
+++ glibc-cvs-2.9/configure.in	2009-11-24 17:53:35.000000000 -0800
fr@1654
    25
@@ -844,10 +844,10 @@
fr@1654
    26
 # Accept binutils 2.13 or newer.
fr@1654
    27
 AC_CHECK_PROG_VER(AS, $AS, --version,
fr@1654
    28
 		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
fr@1654
    29
-		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
fr@1654
    30
+		  [2.1[3-9]*|2.20], AS=: critic_missing="$critic_missing as")
fr@1654
    31
 AC_CHECK_PROG_VER(LD, $LD, --version,
fr@1654
    32
 		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
fr@1654
    33
-		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
fr@1654
    34
+		  [2.1[3-9]*|2.20], LD=: critic_missing="$critic_missing ld")
fr@1654
    35
 
fr@1654
    36
 # We need the physical current working directory.  We cannot use the
fr@1654
    37
 # "pwd -P" shell builtin since that's not portable.  Instead we try to