summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-06-11 01:49:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-14 13:23:49 +0100
commite1f0ba3b1cccaf8e209d63dab638b341c029aae6 (patch)
treea40ac0de36ea4d0a86e974f1f3f3bafe60af32dd
parent904749315385b3c2951a23748577cb65b862606b (diff)
downloadopenembedded-core-e1f0ba3b1cccaf8e209d63dab638b341c029aae6.tar.gz
openembedded-core-e1f0ba3b1cccaf8e209d63dab638b341c029aae6.tar.bz2
openembedded-core-e1f0ba3b1cccaf8e209d63dab638b341c029aae6.tar.xz
openembedded-core-e1f0ba3b1cccaf8e209d63dab638b341c029aae6.zip
gettext_0.18.1.1.bb: Fix build on uclibc
Use libc-uclibc override to seprate out uclibc bits instead of using TARGET_OS Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch21
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb7
2 files changed, 25 insertions, 3 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
new file mode 100644
index 000000000..d8d10db2a
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
@@ -0,0 +1,21 @@
+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.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 5f5f164ad..f54c1113a 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -12,11 +12,12 @@ PROVIDES = "virtual/libintl virtual/gettext"
PROVIDES_virtclass-native = ""
CONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
- file://wchar-uclibc.patch \
"
-SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
+ file://gettext-error_print_progname.patch \
+ file://gnulib-uclibc-sched_param-def.patch \
+ "
SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"