summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-19 19:31:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 16:59:18 +0100
commit7f5437ac91a66901d71828fe648a8a470af877a3 (patch)
tree31ac727a4cd9a6e790b17328fd3a7bea91df3b6b /meta/recipes-support
parent39bf88ed40b196b8eb7a419eee984a3f730dc78c (diff)
downloadpoky-7f5437ac91a66901d71828fe648a8a470af877a3.tar.gz
aspell: Fix build with gcc7
(From OE-Core rev: 4d417d0a9bb71d6bf068481c5ac0e3e3b2601d66) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/aspell/aspell/gcc7.patch40
-rw-r--r--meta/recipes-support/aspell/aspell_0.60.6.1.bb4
2 files changed, 43 insertions, 1 deletions
diff --git a/meta/recipes-support/aspell/aspell/gcc7.patch b/meta/recipes-support/aspell/aspell/gcc7.patch
new file mode 100644
index 0000000000..6ffd0772fa
--- /dev/null
+++ b/meta/recipes-support/aspell/aspell/gcc7.patch
@@ -0,0 +1,40 @@
1From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001
2From: Kevin Atkinson <kevina@gnu.org>
3Date: Thu, 29 Dec 2016 00:50:31 -0500
4Subject: [PATCH] Compile Fixes for GCC 7.
5
6Closes #519.
7---
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Backport
10
11 modules/filter/tex.cpp | 2 +-
12 prog/check_funs.cpp | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp
16index a979539..19ab63c 100644
17--- a/modules/filter/tex.cpp
18+++ b/modules/filter/tex.cpp
19@@ -174,7 +174,7 @@ namespace {
20
21 if (c == '{') {
22
23- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
24+ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
25 push_command(Parm);
26
27 top.in_what = Parm;
28diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp
29index db54f3d..89ee09d 100644
30--- a/prog/check_funs.cpp
31+++ b/prog/check_funs.cpp
32@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) {
33 }
34 }
35 if (i == width-1) {
36- if (word == '\0')
37+ if (*word == '\0')
38 put(out,' ');
39 else if (word[len] == '\0')
40 put(out, word, len);
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index 5a23754b74..19a7155d66 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
6 6
7PR = "r1" 7PR = "r1"
8 8
9SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" 9SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \
10 file://gcc7.patch \
11 "
10SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7" 12SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7"
11SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" 13SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1"
12 14