summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-01-15 20:37:45 -0800
committerKhem Raj <raj.khem@gmail.com>2020-01-16 22:21:44 -0800
commit7b01ee5d4ed27a82fe8ba8467d7985e9e438c904 (patch)
tree02483bdf1fa2a597570c0ca42bcd2df2bc17ab18
parent4e8c7dffde2bea304b4556b7d334aeca4e75cc57 (diff)
downloadopenembedded-core-contrib-yoe/mut.tar.gz
openembedded-core-contrib-yoe/mut.tar.bz2
openembedded-core-contrib-yoe/mut.zip
gettext: Fix overloadable error with clangyoe/mut
Clang detects that getcwd is being re-declared and signatures don't match, simple solution is to let clang use overloadable attribute Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch22
-rw-r--r--meta/recipes-core/gettext/gettext_0.20.1.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch b/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch
new file mode 100644
index 0000000000..1b41cb464e
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch
@@ -0,0 +1,22 @@
+Use overloadable attribute to aid clang
+
+Fixes
+dcigettext.c:147:7: error: redeclaration of 'getcwd' must have the 'overloadable' attribute
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/gettext-runtime/intl/dcigettext.c
++++ b/gettext-runtime/intl/dcigettext.c
+@@ -144,7 +144,11 @@ char *getwd ();
+ # if VMS
+ # define getcwd(buf, max) (getcwd) (buf, max, 0)
+ # else
+-char *getcwd ();
++char
++#ifdef __clang__
++__attribute__((overloadable))
++#endif
++*getcwd ();
+ # endif
+ # endif
+ # ifndef HAVE_STPCPY
diff --git a/meta/recipes-core/gettext/gettext_0.20.1.bb b/meta/recipes-core/gettext/gettext_0.20.1.bb
index 09628bc4a3..3b576f45e9 100644
--- a/meta/recipes-core/gettext/gettext_0.20.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.20.1.bb
@@ -25,6 +25,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://serial-tests-config.patch \
file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \
file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
+ file://overloadable.patch \
"
SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2"