patches/glibc/2.9/600-recent-binutils.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:28:10 2011 +0200 (2011-08-02)
changeset 2590 b64cfb67944e
parent 1654 489e9f2158fa
permissions -rw-r--r--
scripts/functions: svn retrieval first tries the mirror for tarballs

The svn download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via svn.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard svn retrieval will kick in.

Reported-by: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1967
     1
diff -durN glibc-2.9.orig/configure glibc-2.9/configure
yann@1967
     2
--- glibc-2.9.orig/configure	2010-05-18 23:47:23.000000000 +0200
yann@1967
     3
+++ glibc-2.9/configure	2010-05-18 23:50:04.000000000 +0200
yann@1967
     4
@@ -4534,7 +4534,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]*)
yann@1967
     9
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
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
 
yann@1967
    13
@@ -4597,7 +4597,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]*)
yann@1967
    18
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
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
 
yann@1967
    22
diff -durN glibc-2.9.orig/configure.in glibc-2.9/configure.in
yann@1967
    23
--- glibc-2.9.orig/configure.in	2010-05-18 23:47:23.000000000 +0200
yann@1967
    24
+++ glibc-2.9/configure.in	2010-05-18 23:51:25.000000000 +0200
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")
yann@1967
    30
+		  [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], 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")
yann@1967
    34
+		  [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], 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