summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-04-25 10:59:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 16:59:18 +0100
commit95ee4896608074232cbc8126d4ee0208c2fe6afa (patch)
tree8e84f99004454c163f7209084d1217c6fd1c20f7
parentf9a30c184c90aaeaddc953f9ca3e23a31e6b0923 (diff)
downloadpoky-95ee4896608074232cbc8126d4ee0208c2fe6afa.tar.gz
libiconv: fix linker failure under GCC 7
(From OE-Core rev: 7e646dd052c7013416d99d4c0201b4694fc1bbb6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.14/0001-Fix-link-error-when-compiling-with-gcc-O0.patch36
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.14.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-support/libiconv/libiconv-1.14/0001-Fix-link-error-when-compiling-with-gcc-O0.patch b/meta/recipes-support/libiconv/libiconv-1.14/0001-Fix-link-error-when-compiling-with-gcc-O0.patch
new file mode 100644
index 0000000000..15af15ff8c
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.14/0001-Fix-link-error-when-compiling-with-gcc-O0.patch
@@ -0,0 +1,36 @@
1This fix is also needed for GCC7.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From b29089d8b43abc8fba073da7e6dccaeba56b2b70 Mon Sep 17 00:00:00 2001
7From: Bruno Haible <bruno@clisp.org>
8Date: Sat, 19 Nov 2016 17:13:56 +0100
9Subject: [PATCH] Fix link error when compiling with gcc -O0.
10
11---
12 ChangeLog | 7 +++++++
13 lib/iconv.c | 6 +++++-
14 2 files changed, 12 insertions(+), 1 deletion(-)
15
16diff --git a/lib/iconv.c b/lib/iconv.c
17index 5a1a325..31853a7 100644
18--- a/lib/iconv.c
19+++ b/lib/iconv.c
20@@ -178,8 +178,12 @@ static const struct alias sysdep_aliases[] = {
21 };
22 #ifdef __GNUC__
23 __inline
24+#else
25+#ifdef __cplusplus
26+inline
27+#endif
28 #endif
29-const struct alias *
30+static const struct alias *
31 aliases2_lookup (register const char *str)
32 {
33 const struct alias * ptr;
34--
352.8.1
36
diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb
index 9fd5114ac8..8d272eb6a0 100644
--- a/meta/recipes-support/libiconv/libiconv_1.14.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.14.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
13SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
14 file://autoconf.patch \ 14 file://autoconf.patch \
15 file://add-relocatable-module.patch \ 15 file://add-relocatable-module.patch \
16 file://0001-Fix-link-error-when-compiling-with-gcc-O0.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6" 19SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6"