mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 20:27:58 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
f9a30c184c
commit
95ee489660
@@ -0,0 +1,36 @@
|
||||
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
|
||||
|
||||
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
|
||||
SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
|
||||
file://autoconf.patch \
|
||||
file://add-relocatable-module.patch \
|
||||
file://0001-Fix-link-error-when-compiling-with-gcc-O0.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6"
|
||||
|
||||
Reference in New Issue
Block a user