diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-01-26 11:27:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:48:09 +0000 |
commit | 7c6d2f093b42859218ae71977c98aa5b3d2b0ebc (patch) | |
tree | e247a3558eb3364a7a3e80dc0e63774d00930605 /meta | |
parent | 5b5b17549ea3a9de775da6cd791181d2687186cd (diff) | |
download | poky-7c6d2f093b42859218ae71977c98aa5b3d2b0ebc.tar.gz |
gettext: Drop overloadable attibute for getcwd declaration
(From OE-Core rev: d922ccdb79a386c2ea6004520d76277bc8867fcb)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch | 22 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.20.1.bb | 2 |
2 files changed, 0 insertions, 24 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 deleted file mode 100644 index 1b41cb464e..0000000000 --- a/meta/recipes-core/gettext/gettext-0.20.1/overloadable.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Use overloadable attribute to aid clang | ||
2 | |||
3 | Fixes | ||
4 | dcigettext.c:147:7: error: redeclaration of 'getcwd' must have the 'overloadable' attribute | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- a/gettext-runtime/intl/dcigettext.c | ||
9 | +++ b/gettext-runtime/intl/dcigettext.c | ||
10 | @@ -144,7 +144,11 @@ char *getwd (); | ||
11 | # if VMS | ||
12 | # define getcwd(buf, max) (getcwd) (buf, max, 0) | ||
13 | # else | ||
14 | -char *getcwd (); | ||
15 | +char | ||
16 | +#ifdef __clang__ | ||
17 | +__attribute__((overloadable)) | ||
18 | +#endif | ||
19 | +*getcwd (); | ||
20 | # endif | ||
21 | # endif | ||
22 | # 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 \ | |||
25 | file://serial-tests-config.patch \ | 25 | file://serial-tests-config.patch \ |
26 | file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \ | 26 | file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \ |
27 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ | 27 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ |
28 | file://overloadable.patch \ | ||
29 | " | 28 | " |
30 | |||
31 | SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" | 29 | SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" |
32 | SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c" | 30 | SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c" |
33 | 31 | ||