summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.14/0001-Fix-link-error-when-compiling-with-gcc-O0.patch36
1 files changed, 0 insertions, 36 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
deleted file mode 100644
index 15af15ff8c..0000000000
--- a/meta/recipes-support/libiconv/libiconv-1.14/0001-Fix-link-error-when-compiling-with-gcc-O0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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