[oe-commits] Khem Raj : gettext: Fix build with uclibc remove upstreamed patches

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ab692ed618f83df2ce452769165314e70b867345
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ab692ed618f83df2ce452769165314e70b867345

Author: Khem Raj <raj.khem at gmail.com>
Date:   Thu Jan 24 13:07:23 2013 -0800

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

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../gnulib-uclibc-sched_param-def.patch            |   21 ------
 .../gettext/gettext-0.18.2/wchar-uclibc.patch      |   74 --------------------
 meta/recipes-core/gettext/gettext_0.18.2.bb        |    3 -
 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 d8d10db..0000000
--- a/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
+++ /dev/null
@@ -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
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 34e3f1a..0000000
--- a/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
+++ /dev/null
@@ -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
diff --git a/meta/recipes-core/gettext/gettext_0.18.2.bb b/meta/recipes-core/gettext/gettext_0.18.2.bb
index 3e93089..086f7fa 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 \
 	   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"