Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18/100-makeinfo-version.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 05 23:02:43 2009 +0000 (2009-01-05)
changeset 1126 1ab3d2e08c8b
permissions -rw-r--r--
Split CT_ExtractAndPatch in two: CT_Extract and CT_Patch:
- it is unworkable to have CT_ExtactAndPAtch cope with all those silly glibc addons:
- they can have 'short' (as 'ports') or 'long' (as glibc-ports-2.7) names
- patches are against eithe the short or long name, but non-uniformly use one or the other
- it is the reposibility of the component (glibc in this case) to handle corner cases such as those
- update all components to use the new functions

/trunk/scripts/build/tools/000-template.sh | 3 2 1 0 +-
/trunk/scripts/build/tools/100-libelf.sh | 3 2 1 0 +-
/trunk/scripts/build/tools/200-sstrip.sh | 3 2 1 0 +-
/trunk/scripts/build/kernel/linux.sh | 3 2 1 0 +-
/trunk/scripts/build/binutils.sh | 3 2 1 0 +-
/trunk/scripts/build/cc/gcc.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/000-template.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/100-dmalloc.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/400-ltrace.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/300-gdb.sh | 9 6 3 0 +++--
/trunk/scripts/build/debug/500-strace.sh | 7 3 4 0 ++--
/trunk/scripts/build/debug/200-duma.sh | 19 8 11 0 ++++------
/trunk/scripts/build/libc/glibc.sh | 14 12 2 0 ++++++-
/trunk/scripts/build/libc/uClibc.sh | 13 9 4 0 +++++--
/trunk/scripts/build/libc/eglibc.sh | 14 12 2 0 ++++++-
/trunk/scripts/build/gmp.sh | 3 2 1 0 +-
/trunk/scripts/build/mpfr.sh | 3 2 1 0 +-
/trunk/scripts/functions | 68 36 32 0 +++++++++++++++++++-----------------
18 files changed, 108 insertions(+), 69 deletions(-)
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