summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-04-04 10:35:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-04 14:04:43 +0100
commit66bee6afa1a12d9c6393b725993dc4dfd335f3bf (patch)
tree8a3b9c49a51bbf738d35ad5dbb765eb479b6b750 /meta/recipes-devtools
parentdabf7a4b75037a9f7a0630d0e8e8d734df80960f (diff)
downloadpoky-66bee6afa1a12d9c6393b725993dc4dfd335f3bf.tar.gz
gcc: add patch to disable texinfo when texinfo is 5.0 or newer
* this is needed only for 4.7 series, newer works fine with texinfo-5* [YOCTO #3947] (From OE-Core rev: d85d15972d78b5dda7a03dd273a64305f115282b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch107
2 files changed, 108 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 49f4010b49..a05cac99cd 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -76,6 +76,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
76 file://0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch \ 76 file://0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch \
77 file://use-ml-conf-files-from-B.patch \ 77 file://use-ml-conf-files-from-B.patch \
78 file://wcast-qual-PR55383.patch \ 78 file://wcast-qual-PR55383.patch \
79 file://disable-texinfo-5.patch \
79 " 80 "
80SRC_URI[md5sum] = "cc308a0891e778cfda7a151ab8a6e762" 81SRC_URI[md5sum] = "cc308a0891e778cfda7a151ab8a6e762"
81SRC_URI[sha256sum] = "8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084" 82SRC_URI[sha256sum] = "8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084"
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
new file mode 100644
index 0000000000..d5c9165a06
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch
@@ -0,0 +1,107 @@
1Upstream-Status: Pending
2
3gcc-4.8 is compatible with texinfo-5, so this is only temporary fix
4(we don't need info files on target)
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8diff -uNr gcc-4.7.2.orig/configure.ac gcc-4.7.2/configure.ac
9--- gcc-4.7.2.orig/configure.ac 2013-04-04 09:10:24.600848496 +0200
10+++ gcc-4.7.2/configure.ac 2013-04-04 09:51:51.808031042 +0200
11@@ -3031,7 +3031,7 @@
12 # For an installed makeinfo, we require it to be from texinfo 4.7 or
13 # higher, else we use the "missing" dummy.
14 if ${MAKEINFO} --version \
15- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
16+ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then
17 :
18 else
19 MAKEINFO="$MISSING makeinfo"
20diff -uNr gcc-4.7.2.orig/gcc/configure.ac gcc-4.7.2/gcc/configure.ac
21--- gcc-4.7.2.orig/gcc/configure.ac 2013-04-04 09:10:30.523848931 +0200
22+++ gcc-4.7.2/gcc/configure.ac 2013-04-04 09:52:16.111032826 +0200
23@@ -871,7 +871,7 @@
24 # that we can use it.
25 ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
26 [GNU texinfo.* \([0-9][0-9.]*\)],
27- [4.[7-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
28+ [4.[7-9]*|4.[1-9][0-9]*])
29 if test $gcc_cv_prog_makeinfo_modern = no; then
30 AC_MSG_WARN([
31 *** Makeinfo is missing or too old.
32diff -uNr gcc-4.7.2.orig/libgomp/configure.ac gcc-4.7.2/libgomp/configure.ac
33--- gcc-4.7.2.orig/libgomp/configure.ac 2010-12-06 01:50:04.000000000 +0100
34+++ gcc-4.7.2/libgomp/configure.ac 2013-04-04 09:51:29.571029410 +0200
35@@ -129,7 +129,7 @@
36 # that we can use it.
37 ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
38 [GNU texinfo.* \([0-9][0-9.]*\)],
39- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
40+ [4.[4-9]*|4.[1-9][0-9]*])
41 AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
42
43
44diff -uNr gcc-4.7.2.orig/libiberty/configure.ac gcc-4.7.2/libiberty/configure.ac
45--- gcc-4.7.2.orig/libiberty/configure.ac 2011-08-22 18:54:02.000000000 +0200
46+++ gcc-4.7.2/libiberty/configure.ac 2013-04-04 09:51:20.685028758 +0200
47@@ -84,6 +84,12 @@
48 AC_MSG_WARN([
49 *** Makeinfo is too old. Info documentation will not be built.])
50 ;;
51+ x*\ [[5-9]].* )
52+ MAKEINFO="@echo $MAKEINFO is too new, 5.0 or newer does not work; true"
53+ BUILD_INFO=
54+ AC_MSG_WARN([
55+*** Makeinfo is too new. Info documentation will not be built.])
56+ ;;
57 esac
58 ;;
59 esac
60diff -uNr gcc-4.7.2.orig/libitm/configure.ac gcc-4.7.2/libitm/configure.ac
61--- gcc-4.7.2.orig/libitm/configure.ac 2012-02-13 22:46:38.000000000 +0100
62+++ gcc-4.7.2/libitm/configure.ac 2013-04-04 09:51:59.676031620 +0200
63@@ -140,7 +140,7 @@
64 # that we can use it.
65 ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
66 [GNU texinfo.* \([0-9][0-9.]*\)],
67- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
68+ [4.[4-9]*|4.[1-9][0-9]*])
69 AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
70
71
72diff -uNr gcc-4.7.2.orig/libquadmath/configure.ac gcc-4.7.2/libquadmath/configure.ac
73--- gcc-4.7.2.orig/libquadmath/configure.ac 2012-05-31 20:57:56.000000000 +0200
74+++ gcc-4.7.2/libquadmath/configure.ac 2013-04-04 09:49:52.432022281 +0200
75@@ -48,7 +48,7 @@
76 # that we can use it.
77 ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
78 [GNU texinfo.* \([0-9][0-9.]*\)],
79- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
80+ [4.[4-9]*|4.[1-9][0-9]*])
81 AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
82
83 ACX_BUGURL([http://gcc.gnu.org/bugs.html])
84diff -uNr gcc-4.7.2.orig/libstdc++-v3/configure.ac gcc-4.7.2/libstdc++-v3/configure.ac
85--- gcc-4.7.2.orig/libstdc++-v3/configure.ac 2012-08-06 16:34:27.000000000 +0200
86+++ gcc-4.7.2/libstdc++-v3/configure.ac 2013-04-04 09:49:57.483022652 +0200
87@@ -344,7 +344,7 @@
88 # that we can use it.
89 ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
90 [GNU texinfo.* \([0-9][0-9.]*\)],
91- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
92+ [4.[4-9]*|4.[1-9][0-9]*])
93 AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
94
95 # Check for doxygen
96diff -uNr gcc-4.7.2.orig/configure gcc-4.7.2/configure
97--- gcc-4.7.2.orig/configure 2013-04-04 10:23:58.009172414 +0200
98+++ gcc-4.7.2/configure 2013-04-04 10:26:42.696184501 +0200
99@@ -7858,7 +7858,7 @@
100 # For an installed makeinfo, we require it to be from texinfo 4.7 or
101 # higher, else we use the "missing" dummy.
102 if ${MAKEINFO} --version \
103- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
104+ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then
105 :
106 else
107 MAKEINFO="$MISSING makeinfo"