From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 26 Jan 2020 19:27:45 +0000 (-0800)
Subject: gettext: Drop overloadable attibute for getcwd declaration
X-Git-Tag: uninative-2.8~396
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d922ccdb79a386c2ea6004520d76277bc8867fcb;p=openembedded-core.git

gettext: Drop overloadable attibute for getcwd declaration

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch b/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch
deleted file mode 100644
index 1b41cb464e..0000000000
--- a/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 3b576f45e9..214803f767 100644
--- a/meta/recipes-core/gettext/gettext_0.20.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.20.1.bb
@@ -25,9 +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"
 SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c"