summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext/gettext-0.18.2
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.18.2')
-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/parallel.patch36
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch74
3 files changed, 131 insertions, 0 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
new file mode 100644
index 0000000000..d8d10db2ab
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
@@ -0,0 +1,21 @@
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/parallel.patch b/meta/recipes-core/gettext/gettext-0.18.2/parallel.patch
new file mode 100644
index 0000000000..f2c567d188
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.2/parallel.patch
@@ -0,0 +1,36 @@
1instal libgettextlib.a before removing it
2
3In a multiple job build, Makefile can simultaneously
4be installing and removing libgettextlib.a. We serialize
5the operations.
6
7Upstream-Status: Pending
8
9Signed-off-by: Joe Slater <jslater@windriver.com>
10
11--- a/gettext-tools/gnulib-lib/Makefile.am
12+++ b/gettext-tools/gnulib-lib/Makefile.am
13@@ -57,6 +57,10 @@ endif
14 # Rules generated and collected by gnulib-tool.
15 include Makefile.gnulib
16
17+# defined in Makefile.gnulib but missing this dependency
18+#
19+install-exec-clean: install-libLTLIBRARIES
20+
21 # Which classes to export from the shared library.
22 MOOPPFLAGS += --dllexport=styled_ostream
23
24--- a/gettext-tools/src/Makefile.am
25+++ b/gettext-tools/src/Makefile.am
26@@ -229,8 +229,8 @@ libgettextsrc_la_LDFLAGS += -Wl,--export
27 endif
28
29 # No need to install libgettextsrc.a, except on AIX.
30-install-exec-local: install-libLTLIBRARIES install-exec-clean
31-install-exec-clean:
32+install-exec-local: install-exec-clean
33+install-exec-clean: install-libLTLIBRARIES
34 case "@host_os@" in \
35 aix*) ;; \
36 *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \
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
new file mode 100644
index 0000000000..34e3f1a34a
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
@@ -0,0 +1,74 @@
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