summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-08-05 17:36:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 13:27:32 +0000
commitdfe39ea18733f8aa4f66a6454617c725b842b7ba (patch)
treeec9ed047a151fcc0a2eb2a49766b35830344341c
parent4525e2997990ed9563d6108e1809e9c1cd1f06aa (diff)
downloadpoky-dfe39ea18733f8aa4f66a6454617c725b842b7ba.tar.gz
gettext_0.16.1: remove obsolete uclibc specific patch
gettext-error_print_progname.patch was originally created for gettext v0.14.6 and does not apply cleanly to gettext v0.16.1. Since the original issue addressed by the patch isn't documented and because gettext v0.16.1 seems to be build OK for uclibc without the patch, assume the patch is obsolete and no longer required. (From OE-Core rev: 66e229474271a4ae6df8b5377bb2f9fe8175fb64) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (From OE-Core master rev: d95d92a) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch19
-rw-r--r--meta/recipes-core/gettext/gettext_0.16.1.bb4
2 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
deleted file mode 100644
index 93d91942f0..0000000000
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1
2# Pulled from OpenEmbedded
3#
4# Commented by: Saul Wold <saul.wold@intel.com>
5
6Upstream-Status: Inappropriate [licensing]
7
8diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
9--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500
10+++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600
11@@ -50,7 +50,7 @@
12 /* If NULL, error will flush stdout, then print on stderr the program
13 name, a colon and a space. Otherwise, error will call this
14 function without parameters instead. */
15-extern DLL_VARIABLE void (*error_print_progname) (void);
16+void (*error_print_progname) (void);
17
18 /* This variable is incremented each time `error' is called. */
19 extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 892194c9ce..956d2387bd 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -21,10 +21,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
21 file://hardcode_macro_version.patch \ 21 file://hardcode_macro_version.patch \
22 " 22 "
23 23
24
25SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
26SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
27
28SRC_URI[md5sum] = "3d9ad24301c6d6b17ec30704a13fe127" 24SRC_URI[md5sum] = "3d9ad24301c6d6b17ec30704a13fe127"
29SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d" 25SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d"
30 26