From 787a95d405c37e4b40ee82b0c528a2544296c4b5 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 28 Sep 2007 16:26:40 +0000 Subject: [PATCH] - fix texinfo version check. The next release will most likely supercede these --- .../2.18.50.0.1/100-makeinfo-version.patch | 32 +++++++++++++++++++ .../binutils/2.18/100-makeinfo-version.patch | 32 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 toolchain/binutils/2.18.50.0.1/100-makeinfo-version.patch create mode 100644 toolchain/binutils/2.18/100-makeinfo-version.patch diff --git a/toolchain/binutils/2.18.50.0.1/100-makeinfo-version.patch b/toolchain/binutils/2.18.50.0.1/100-makeinfo-version.patch new file mode 100644 index 0000000000..d911d6236e --- /dev/null +++ b/toolchain/binutils/2.18.50.0.1/100-makeinfo-version.patch @@ -0,0 +1,32 @@ +diff -u binutils-2.18-orig/configure binutils-2.18/configure +--- binutils-2.18-orig/configure 2007-08-06 16:29:40.000000000 -0400 ++++ binutils-2.18/configure 2007-09-27 22:41:51.000000000 -0400 +@@ -6125,10 +6125,10 @@ + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) + +- # For an installed makeinfo, we require it to be from texinfo 4.4 or ++ # For an installed makeinfo, we require it to be from texinfo 4.6 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac +--- binutils-2.18-orig/configure.ac 2007-08-28 16:24:26.000000000 -0400 ++++ binutils-2.18/configure.ac 2007-09-27 22:41:00.000000000 -0400 +@@ -2400,10 +2400,10 @@ + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) + changequote(,) +- # For an installed makeinfo, we require it to be from texinfo 4.4 or ++ # For an installed makeinfo, we require it to be from texinfo 4.6 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" diff --git a/toolchain/binutils/2.18/100-makeinfo-version.patch b/toolchain/binutils/2.18/100-makeinfo-version.patch new file mode 100644 index 0000000000..d911d6236e --- /dev/null +++ b/toolchain/binutils/2.18/100-makeinfo-version.patch @@ -0,0 +1,32 @@ +diff -u binutils-2.18-orig/configure binutils-2.18/configure +--- binutils-2.18-orig/configure 2007-08-06 16:29:40.000000000 -0400 ++++ binutils-2.18/configure 2007-09-27 22:41:51.000000000 -0400 +@@ -6125,10 +6125,10 @@ + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) + +- # For an installed makeinfo, we require it to be from texinfo 4.4 or ++ # For an installed makeinfo, we require it to be from texinfo 4.6 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac +--- binutils-2.18-orig/configure.ac 2007-08-28 16:24:26.000000000 -0400 ++++ binutils-2.18/configure.ac 2007-09-27 22:41:00.000000000 -0400 +@@ -2400,10 +2400,10 @@ + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) + changequote(,) +- # For an installed makeinfo, we require it to be from texinfo 4.4 or ++ # For an installed makeinfo, we require it to be from texinfo 4.6 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" -- 2.30.2