summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-31 20:41:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-04 14:09:40 +0100
commitaa0772c6e7b28cfa2e73fc2f9a743aab9c7d5ee8 (patch)
tree2da0ad51e606505c509d4bdc0162e02f7191159b
parent69f1a6d2d5fec8a542aed7c9c1eed2c3941940d4 (diff)
downloadpoky-aa0772c6e7b28cfa2e73fc2f9a743aab9c7d5ee8.tar.gz
bison: Make compilable on uclibc
Import patch from OE to fix compilation on uclibc Let inherit gettext take care of gettext dependencies (From OE-Core rev: 417c41f3083df120cf745c274b487218828dd147) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch19
-rw-r--r--meta/recipes-devtools/bison/bison_2.3.bb4
-rw-r--r--meta/recipes-devtools/bison/bison_2.4.3.bb10
3 files changed, 27 insertions, 6 deletions
diff --git a/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
new file mode 100644
index 0000000000..50652d8bab
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
@@ -0,0 +1,19 @@
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
7http://bugs.gentoo.org/336484
8
9--- m4-1.4.14/lib/spawn.in.h
10+++ m4-1.4.14/lib/spawn.in.h
11@@ -31,7 +31,7 @@
12
13 /* Get definitions of 'struct sched_param' and 'sigset_t'.
14 But avoid namespace pollution on glibc systems. */
15-#ifndef __GLIBC__
16+#if !defined __GLIBC__ || defined __UCLIBC__
17 # include <sched.h>
18 # include <signal.h>
19 #endif
diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb
index 08aaa6e06a..8d76f7bf52 100644
--- a/meta/recipes-devtools/bison/bison_2.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
9SECTION = "devel" 9SECTION = "devel"
10PRIORITY = "optional" 10PRIORITY = "optional"
11DEPENDS = "gettext bison-native" 11DEPENDS = "bison-native"
12 12
13PR = "r0" 13PR = "r0"
14 14
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ec
23DEPENDS_virtclass-native = "gettext-native" 23DEPENDS_virtclass-native = "gettext-native"
24SRC_URI_virtclass-native = "${BASE_SRC_URI}" 24SRC_URI_virtclass-native = "${BASE_SRC_URI}"
25 25
26inherit autotools 26inherit autotools gettext
27acpaths = "-I ${S}/m4" 27acpaths = "-I ${S}/m4"
28 28
29do_install_append_virtclass-native() { 29do_install_append_virtclass-native() {
diff --git a/meta/recipes-devtools/bison/bison_2.4.3.bb b/meta/recipes-devtools/bison/bison_2.4.3.bb
index fa2f15400a..3c164d90e0 100644
--- a/meta/recipes-devtools/bison/bison_2.4.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.4.3.bb
@@ -8,12 +8,14 @@ LICENSE = "GPLv3"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
9SECTION = "devel" 9SECTION = "devel"
10PRIORITY = "optional" 10PRIORITY = "optional"
11DEPENDS = "gettext bison-native" 11DEPENDS = "bison-native"
12 12
13PR = "r1" 13PR = "r2"
14 14
15BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ 15BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
16 file://m4.patch;patch=1" 16 file://m4.patch \
17 file://uclibc-sched_param-def.patch \
18 "
17 19
18SRC_URI = "${BASE_SRC_URI} \ 20SRC_URI = "${BASE_SRC_URI} \
19 file://fix_cross_manpage_building.patch " 21 file://fix_cross_manpage_building.patch "
@@ -24,7 +26,7 @@ SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65
24DEPENDS_virtclass-native = "gettext-native" 26DEPENDS_virtclass-native = "gettext-native"
25SRC_URI_virtclass-native = "${BASE_SRC_URI}" 27SRC_URI_virtclass-native = "${BASE_SRC_URI}"
26 28
27inherit autotools 29inherit autotools gettext
28acpaths = "-I ${S}/m4" 30acpaths = "-I ${S}/m4"
29 31
30do_install_append_virtclass-native() { 32do_install_append_virtclass-native() {