diff --git a/gdb-6.6-upstream.patch b/gdb-6.6-upstream.patch index e90333f..008949c 100644 --- a/gdb-6.6-upstream.patch +++ b/gdb-6.6-upstream.patch @@ -882,3 +882,33 @@ IBM OzLabs - Linux Technology Centre } break; case DW_LNS_set_column: + + + +2007-09-15 Alan Modra + + * configure.ac: Correct makeinfo version check. + * configure: Regenerate. + +#--- ./configure.ac 14 Sep 2007 14:51:36 -0000 1.25 +#+++ ./configure.ac 14 Sep 2007 15:47:01 -0000 1.26 +#@@ -2462,7 +2462,7 @@ changequote(,) +# # For an installed makeinfo, we require it to be from texinfo 4.4 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\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then +# : +# else +# MAKEINFO="$MISSING makeinfo" +--- ./configure 14 Sep 2007 14:51:36 -0000 1.277 ++++ ./configure 14 Sep 2007 15:47:01 -0000 1.278 +@@ -6192,7 +6192,7 @@ case " $build_configdirs " in + # For an installed makeinfo, we require it to be from texinfo 4.4 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\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" diff --git a/gdb.spec b/gdb.spec index 1063084..409a5f0 100644 --- a/gdb.spec +++ b/gdb.spec @@ -11,7 +11,7 @@ Name: gdb Version: 6.6 # The release always contains a leading reserved number, start it at 1. -Release: 15%{?dist} +Release: 16%{?dist} License: GPL Group: Development/Debuggers @@ -637,6 +637,9 @@ fi # don't include the files in include, they are part of binutils %changelog +* Mon Oct 15 2007 Jan Kratochvil - 6.6-16 +- Fix the build compatibility with texinfo >= 4.10. + * Tue Jun 5 2007 Jan Kratochvil - 6.6-15 - Fix crash on missing filenames debug info (BZ 242155).