mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-17 17:23:42 +08:00
- fix texinfo version check. The next release will most likely supercede these
This commit is contained in:
parent
b8f28d656b
commit
787a95d405
32
toolchain/binutils/2.18.50.0.1/100-makeinfo-version.patch
Normal file
32
toolchain/binutils/2.18.50.0.1/100-makeinfo-version.patch
Normal file
@ -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"
|
32
toolchain/binutils/2.18/100-makeinfo-version.patch
Normal file
32
toolchain/binutils/2.18/100-makeinfo-version.patch
Normal file
@ -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"
|
Loading…
Reference in New Issue
Block a user