diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch b/meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch deleted file mode 100644 index d5c9165a06..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch +++ /dev/null @@ -1,107 +0,0 @@ -Upstream-Status: Pending - -gcc-4.8 is compatible with texinfo-5, so this is only temporary fix -(we don't need info files on target) - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -diff -uNr gcc-4.7.2.orig/configure.ac gcc-4.7.2/configure.ac ---- gcc-4.7.2.orig/configure.ac 2013-04-04 09:10:24.600848496 +0200 -+++ gcc-4.7.2/configure.ac 2013-04-04 09:51:51.808031042 +0200 -@@ -3031,7 +3031,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.7 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -uNr gcc-4.7.2.orig/gcc/configure.ac gcc-4.7.2/gcc/configure.ac ---- gcc-4.7.2.orig/gcc/configure.ac 2013-04-04 09:10:30.523848931 +0200 -+++ gcc-4.7.2/gcc/configure.ac 2013-04-04 09:52:16.111032826 +0200 -@@ -871,7 +871,7 @@ - # that we can use it. - ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, - [GNU texinfo.* \([0-9][0-9.]*\)], -- [4.[7-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) -+ [4.[7-9]*|4.[1-9][0-9]*]) - if test $gcc_cv_prog_makeinfo_modern = no; then - AC_MSG_WARN([ - *** Makeinfo is missing or too old. -diff -uNr gcc-4.7.2.orig/libgomp/configure.ac gcc-4.7.2/libgomp/configure.ac ---- gcc-4.7.2.orig/libgomp/configure.ac 2010-12-06 01:50:04.000000000 +0100 -+++ gcc-4.7.2/libgomp/configure.ac 2013-04-04 09:51:29.571029410 +0200 -@@ -129,7 +129,7 @@ - # that we can use it. - ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version], - [GNU texinfo.* \([0-9][0-9.]*\)], -- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) -+ [4.[4-9]*|4.[1-9][0-9]*]) - AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") - - -diff -uNr gcc-4.7.2.orig/libiberty/configure.ac gcc-4.7.2/libiberty/configure.ac ---- gcc-4.7.2.orig/libiberty/configure.ac 2011-08-22 18:54:02.000000000 +0200 -+++ gcc-4.7.2/libiberty/configure.ac 2013-04-04 09:51:20.685028758 +0200 -@@ -84,6 +84,12 @@ - AC_MSG_WARN([ - *** Makeinfo is too old. Info documentation will not be built.]) - ;; -+ x*\ [[5-9]].* ) -+ MAKEINFO="@echo $MAKEINFO is too new, 5.0 or newer does not work; true" -+ BUILD_INFO= -+ AC_MSG_WARN([ -+*** Makeinfo is too new. Info documentation will not be built.]) -+ ;; - esac - ;; - esac -diff -uNr gcc-4.7.2.orig/libitm/configure.ac gcc-4.7.2/libitm/configure.ac ---- gcc-4.7.2.orig/libitm/configure.ac 2012-02-13 22:46:38.000000000 +0100 -+++ gcc-4.7.2/libitm/configure.ac 2013-04-04 09:51:59.676031620 +0200 -@@ -140,7 +140,7 @@ - # that we can use it. - ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version], - [GNU texinfo.* \([0-9][0-9.]*\)], -- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) -+ [4.[4-9]*|4.[1-9][0-9]*]) - AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") - - -diff -uNr gcc-4.7.2.orig/libquadmath/configure.ac gcc-4.7.2/libquadmath/configure.ac ---- gcc-4.7.2.orig/libquadmath/configure.ac 2012-05-31 20:57:56.000000000 +0200 -+++ gcc-4.7.2/libquadmath/configure.ac 2013-04-04 09:49:52.432022281 +0200 -@@ -48,7 +48,7 @@ - # that we can use it. - ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version], - [GNU texinfo.* \([0-9][0-9.]*\)], -- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) -+ [4.[4-9]*|4.[1-9][0-9]*]) - AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") - - ACX_BUGURL([http://gcc.gnu.org/bugs.html]) -diff -uNr gcc-4.7.2.orig/libstdc++-v3/configure.ac gcc-4.7.2/libstdc++-v3/configure.ac ---- gcc-4.7.2.orig/libstdc++-v3/configure.ac 2012-08-06 16:34:27.000000000 +0200 -+++ gcc-4.7.2/libstdc++-v3/configure.ac 2013-04-04 09:49:57.483022652 +0200 -@@ -344,7 +344,7 @@ - # that we can use it. - ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version], - [GNU texinfo.* \([0-9][0-9.]*\)], -- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) -+ [4.[4-9]*|4.[1-9][0-9]*]) - AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") - - # Check for doxygen -diff -uNr gcc-4.7.2.orig/configure gcc-4.7.2/configure ---- gcc-4.7.2.orig/configure 2013-04-04 10:23:58.009172414 +0200 -+++ gcc-4.7.2/configure 2013-04-04 10:26:42.696184501 +0200 -@@ -7858,7 +7858,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.7 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" |