patches/glibc/ports-2.10.1/110-binutils-2.20-compat.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
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@1625
     1
yann@1625
     2
yann@1625
     3
diff -durN glibc-2.10.1.orig/configure glibc-2.10.1/configure
yann@1625
     4
--- glibc-2.10.1.orig/configure	2009-05-17 14:19:31.000000000 +0200
yann@1625
     5
+++ glibc-2.10.1/configure	2009-11-13 00:49:43.000000000 +0100
yann@1625
     6
@@ -4839,7 +4839,7 @@
yann@1625
     7
   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
yann@1625
     8
   case $ac_prog_version in
yann@1625
     9
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
yann@1625
    10
-    2.1[3-9]*)
yann@1625
    11
+    2.1[3-9]*|[2-9].[2-9]*)
yann@1625
    12
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
yann@1625
    13
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
yann@1625
    14
 
yann@1625
    15
@@ -4902,7 +4902,7 @@
yann@1625
    16
   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
yann@1625
    17
   case $ac_prog_version in
yann@1625
    18
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
yann@1625
    19
-    2.1[3-9]*)
yann@1625
    20
+    2.1[3-9]*|[2-9].[2-9]*)
yann@1625
    21
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
yann@1625
    22
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
yann@1625
    23
 
yann@1625
    24
diff -durN glibc-2.10.1.orig/configure.in glibc-2.10.1/configure.in
yann@1625
    25
--- glibc-2.10.1.orig/configure.in	2009-04-04 01:51:47.000000000 +0200
yann@1625
    26
+++ glibc-2.10.1/configure.in	2009-11-13 00:49:43.000000000 +0100
yann@1625
    27
@@ -897,10 +897,10 @@
yann@1625
    28
 # Accept binutils 2.13 or newer.
yann@1625
    29
 AC_CHECK_PROG_VER(AS, $AS, --version,
yann@1625
    30
 		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
yann@1625
    31
-		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
yann@1625
    32
+		  [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
yann@1625
    33
 AC_CHECK_PROG_VER(LD, $LD, --version,
yann@1625
    34
 		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
yann@1625
    35
-		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
yann@1625
    36
+		  [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
yann@1625
    37
 
yann@1625
    38
 # We need the physical current working directory.  We cannot use the
yann@1625
    39
 # "pwd -P" shell builtin since that's not portable.  Instead we try to