summaryrefslogtreecommitdiffstats
path: root/meta
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 15:28:23 +0100
commit6e2f8430fdc1223602e5232eb762d7f7cd0a9e20 (patch)
treeff903c2d3b57bcfab5e5b9534c5d842c789537ca /meta
parent73577ed0a95c2e6947aa27534e849787d632ad7d (diff)
downloadpoky-6e2f8430fdc1223602e5232eb762d7f7cd0a9e20.tar.gz
gettext_0.18.1.1.bb: Fix build on uclibc
Use libc-uclibc override to seprate out uclibc bits instead of using TARGET_OS (From OE-Core rev: e1f0ba3b1cccaf8e209d63dab638b341c029aae6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 0000000000..d8d10db2ab
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/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.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 5f5f164ad9..f54c1113a7 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"
12PROVIDES_virtclass-native = "" 12PROVIDES_virtclass-native = ""
13CONFLICTS_${PN} = "proxy-libintl" 13CONFLICTS_${PN} = "proxy-libintl"
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://wchar-uclibc.patch \
16 " 15 "
17 16
18SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" 17SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
19SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1" 18 file://gettext-error_print_progname.patch \
19 file://gnulib-uclibc-sched_param-def.patch \
20 "
20 21
21SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89" 22SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
22SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" 23SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"