Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18a/100-makeinfo-version.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 406 c33f2e996017
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>
yann@406 
     1
 
diff -u binutils-2.18-orig/configure binutils-2.18/configure
yann@406 
     2
 
--- binutils-2.18-orig/configure	2007-08-06 16:29:40.000000000 -0400
yann@406 
     3
 
+++ binutils-2.18/configure	2007-09-27 22:41:51.000000000 -0400
yann@406 
     4
 
@@ -6125,10 +6125,10 @@
yann@406 
     5
 
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
yann@406 
     6
 
   *)
yann@406 
     7
yann@406 
     8
 
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
yann@406 
     9
 
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
yann@406 
    10
 
     # higher, else we use the "missing" dummy.
yann@406 
    11
 
     if ${MAKEINFO} --version \
yann@406 
    12
 
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
yann@406 
    13
 
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
yann@406 
    14
 
       :
yann@406 
    15
 
     else
yann@406 
    16
 
       MAKEINFO="$MISSING makeinfo"
yann@406 
    17
 
diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac
yann@406 
    18
 
--- binutils-2.18-orig/configure.ac	2007-08-28 16:24:26.000000000 -0400
yann@406 
    19
 
+++ binutils-2.18/configure.ac	2007-09-27 22:41:00.000000000 -0400
yann@406 
    20
 
@@ -2400,10 +2400,10 @@
yann@406 
    21
 
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
yann@406 
    22
 
   *)
yann@406 
    23
 
 changequote(,)
yann@406 
    24
 
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
yann@406 
    25
 
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
yann@406 
    26
 
     # higher, else we use the "missing" dummy.
yann@406 
    27
 
     if ${MAKEINFO} --version \
yann@406 
    28
 
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
yann@406 
    29
 
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
yann@406 
    30
 
       :
yann@406 
    31
 
     else
yann@406 
    32
 
       MAKEINFO="$MISSING makeinfo"
crosstool-ng