Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.10.1/110-binutils-2.20-compat.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com> 
     1 

     2 

     3 diff -durN glibc-2.10.1.orig/configure glibc-2.10.1/configure

     4 --- glibc-2.10.1.orig/configure	2009-05-17 14:19:31.000000000 +0200

     5 +++ glibc-2.10.1/configure	2009-11-13 00:49:43.000000000 +0100

     6 @@ -4839,7 +4839,7 @@

     7    ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`

     8    case $ac_prog_version in

     9      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;

    10 -    2.1[3-9]*)

    11 +    2.1[3-9]*|[2-9].[2-9]*)

    12         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;

    13      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

    14  

    15 @@ -4902,7 +4902,7 @@

    16    ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`

    17    case $ac_prog_version in

    18      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;

    19 -    2.1[3-9]*)

    20 +    2.1[3-9]*|[2-9].[2-9]*)

    21         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;

    22      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

    23  

    24 diff -durN glibc-2.10.1.orig/configure.in glibc-2.10.1/configure.in

    25 --- glibc-2.10.1.orig/configure.in	2009-04-04 01:51:47.000000000 +0200

    26 +++ glibc-2.10.1/configure.in	2009-11-13 00:49:43.000000000 +0100

    27 @@ -897,10 +897,10 @@

    28  # Accept binutils 2.13 or newer.

    29  AC_CHECK_PROG_VER(AS, $AS, --version,

    30  		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],

    31 -		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")

    32 +		  [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")

    33  AC_CHECK_PROG_VER(LD, $LD, --version,

    34  		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],

    35 -		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")

    36 +		  [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")

    37  

    38  # We need the physical current working directory.  We cannot use the

    39  # "pwd -P" shell builtin since that's not portable.  Instead we try to
crosstool-ng