sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Khem Raj 2013-01-24 13:07:23 -08:00 committed by Richard Purdie
parent 0380c0f57b
commit dfc8421c9b
3 changed files with 0 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
View File

@ -1,21 +0,0 @@
uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
and is not needed too per standard. gnulib attempts to use it but we have to account
for it because in this case uclibc does not behave like glibc.
-Khem
Upstream-Status: Pending
Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
===================================================================
--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/spawn.in.h
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
@@ -31,7 +31,7 @@
/* Get definitions of 'struct sched_param' and 'sigset_t'.
But avoid namespace pollution on glibc systems. */
-#ifndef __GLIBC__
+#if !defined __GLIBC__ || defined __UCLIBC__
# include <sched.h>
# include <signal.h>
#endif

74
meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
View File

@ -1,74 +0,0 @@
Upstream-Status: Pending
Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
===================================================================
--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h 2010-05-08 18:36:16.000000000 -0700
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h 2011-05-25 16:28:38.656220937 -0700
@@ -48,6 +48,14 @@
#else
/* Normal invocation convention. */
+#ifdef __need_mbstate_t
+/* Special invocation convention inside uClibc header files. */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_WCHAR_H
#define _GL_ALREADY_INCLUDING_WCHAR_H
@@ -426,3 +434,4 @@
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
#endif
+#endif
Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
===================================================================
--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h 2010-05-24 02:42:48.000000000 -0700
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h 2011-05-25 16:28:15.717360791 -0700
@@ -48,6 +48,14 @@
#else
/* Normal invocation convention. */
+#ifdef __need_mbstate_t
+/* Special invocation convention inside uClibc header files. */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_WCHAR_H
#define _GL_ALREADY_INCLUDING_WCHAR_H
@@ -426,3 +434,4 @@
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
#endif
+#endif
Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
===================================================================
--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h 2010-05-08 18:38:04.000000000 -0700
+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h 2011-05-25 16:28:26.998721087 -0700
@@ -48,6 +48,14 @@
#else
/* Normal invocation convention. */
+#ifdef __need_mbstate_t
+/* Special invocation convention inside uClibc header files. */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_WCHAR_H
#define _GL_ALREADY_INCLUDING_WCHAR_H
@@ -426,3 +434,4 @@
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
#endif
+#endif

3
meta/recipes-core/gettext/gettext_0.18.2.bb
View File

@ -15,9 +15,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://parallel.patch \
"
SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
file://gnulib-uclibc-sched_param-def.patch \
"
LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928"