summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-24 13:07:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-27 13:53:34 +0000
commitdfc8421c9bf582231ebb5d811b7977dab8375252 (patch)
tree6c563e6d3e45f9562ac2de47572a5dd8c50de42c /meta/recipes-core/gettext
parent0380c0f57b298845374604746bef298aee5c6e6d (diff)
downloadpoky-dfc8421c9bf582231ebb5d811b7977dab8375252.tar.gz
gettext: Fix build with uclibc remove upstreamed patches
uclibc specific patches are not needed now as they are available in 0.18.2 gettext now (From OE-Core rev: ab692ed618f83df2ce452769165314e70b867345) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext')
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch21
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch74
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.2.bb3
3 files changed, 0 insertions, 98 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch b/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
deleted file mode 100644
index d8d10db2ab..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
2and is not needed too per standard. gnulib attempts to use it but we have to account
3for it because in this case uclibc does not behave like glibc.
4
5-Khem
6
7Upstream-Status: Pending
8
9Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
10===================================================================
11--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/spawn.in.h
12+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
13@@ -31,7 +31,7 @@
14
15 /* Get definitions of 'struct sched_param' and 'sigset_t'.
16 But avoid namespace pollution on glibc systems. */
17-#ifndef __GLIBC__
18+#if !defined __GLIBC__ || defined __UCLIBC__
19 # include <sched.h>
20 # include <signal.h>
21 #endif
diff --git a/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
deleted file mode 100644
index 34e3f1a34a..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1Upstream-Status: Pending
2
3Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
4===================================================================
5--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h 2010-05-08 18:36:16.000000000 -0700
6+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h 2011-05-25 16:28:38.656220937 -0700
7@@ -48,6 +48,14 @@
8 #else
9 /* Normal invocation convention. */
10
11+#ifdef __need_mbstate_t
12+/* Special invocation convention inside uClibc header files. */
13+
14+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
15+
16+#else
17+/* Normal invocation convention. */
18+
19 #ifndef _GL_WCHAR_H
20
21 #define _GL_ALREADY_INCLUDING_WCHAR_H
22@@ -426,3 +434,4 @@
23 #endif /* _GL_WCHAR_H */
24 #endif /* _GL_WCHAR_H */
25 #endif
26+#endif
27Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
28===================================================================
29--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h 2010-05-24 02:42:48.000000000 -0700
30+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h 2011-05-25 16:28:15.717360791 -0700
31@@ -48,6 +48,14 @@
32 #else
33 /* Normal invocation convention. */
34
35+#ifdef __need_mbstate_t
36+/* Special invocation convention inside uClibc header files. */
37+
38+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
39+
40+#else
41+/* Normal invocation convention. */
42+
43 #ifndef _GL_WCHAR_H
44
45 #define _GL_ALREADY_INCLUDING_WCHAR_H
46@@ -426,3 +434,4 @@
47 #endif /* _GL_WCHAR_H */
48 #endif /* _GL_WCHAR_H */
49 #endif
50+#endif
51Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
52===================================================================
53--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h 2010-05-08 18:38:04.000000000 -0700
54+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h 2011-05-25 16:28:26.998721087 -0700
55@@ -48,6 +48,14 @@
56 #else
57 /* Normal invocation convention. */
58
59+#ifdef __need_mbstate_t
60+/* Special invocation convention inside uClibc header files. */
61+
62+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
63+
64+#else
65+/* Normal invocation convention. */
66+
67 #ifndef _GL_WCHAR_H
68
69 #define _GL_ALREADY_INCLUDING_WCHAR_H
70@@ -426,3 +434,4 @@
71 #endif /* _GL_WCHAR_H */
72 #endif /* _GL_WCHAR_H */
73 #endif
74+#endif
diff --git a/meta/recipes-core/gettext/gettext_0.18.2.bb b/meta/recipes-core/gettext/gettext_0.18.2.bb
index 3e930896a5..086f7fa885 100644
--- a/meta/recipes-core/gettext/gettext_0.18.2.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.2.bb
@@ -15,9 +15,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://parallel.patch \ 15 file://parallel.patch \
16 " 16 "
17 17
18SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
19 file://gnulib-uclibc-sched_param-def.patch \
20 "
21LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " 18LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
22 19
23SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928" 20SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928"