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

The cvs 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 cvs.

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 cvs retrieval will kick in.

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