aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-10 00:31:32 -0700
committerRobert Yang <liezhi.yang@windriver.com>2017-07-10 03:29:49 -0700
commit3ffb0a95642dacb288efc4d636c6c09a2bd57927 (patch)
treed4d24f7bf329976b62bf779a809eada7b4d25be5
parent7dd5dfc4d56f1201110d947ce1ca3c6d64fbc7da (diff)
downloadopenembedded-core-contrib-rbt/libiconv.tar.gz
openembedded-core-contrib-rbt/libiconv.tar.bz2
openembedded-core-contrib-rbt/libiconv.zip
libiconv: remove 0001-Fix-link-error-when-compiling-with-gcc-O0.patchrbt/libiconv
The recipe and patches (including this patch) had been moved into meta-mingw, this dangling patch is useless here, so should be removed. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-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 @@
-This fix is also needed for GCC7.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From b29089d8b43abc8fba073da7e6dccaeba56b2b70 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sat, 19 Nov 2016 17:13:56 +0100
-Subject: [PATCH] Fix link error when compiling with gcc -O0.
-
----
- ChangeLog | 7 +++++++
- lib/iconv.c | 6 +++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib/iconv.c b/lib/iconv.c
-index 5a1a325..31853a7 100644
---- a/lib/iconv.c
-+++ b/lib/iconv.c
-@@ -178,8 +178,12 @@ static const struct alias sysdep_aliases[] = {
- };
- #ifdef __GNUC__
- __inline
-+#else
-+#ifdef __cplusplus
-+inline
-+#endif
- #endif
--const struct alias *
-+static const struct alias *
- aliases2_lookup (register const char *str)
- {
- const struct alias * ptr;
---
-2.8.1
-