bison: Make compilable on uclibc

Import patch from OE to fix compilation on uclibc

Let inherit gettext take care of gettext dependencies

Signed-off-by: Khem Raj <raj.khem@gmail.com>

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 (file)
index 0000000..50652d8
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
@@ -0,0 +1,19 @@
+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
+
+http://bugs.gentoo.org/336484
+
+--- m4-1.4.14/lib/spawn.in.h
++++ m4-1.4.14/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-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb
index 08aaa6e06a2ddcd854ab019600eaec3744f78148..8d76f7bf526243734e0340bb1a41fd39a61c5455 100644 (file)
--- a/meta/recipes-devtools/bison/bison_2.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 SECTION = "devel"
 PRIORITY = "optional"
-DEPENDS = "gettext bison-native"
+DEPENDS = "bison-native"
 
 PR = "r0"
 
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ec
 DEPENDS_virtclass-native = "gettext-native"
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
 
-inherit autotools
+inherit autotools gettext
 acpaths = "-I ${S}/m4"
 
 do_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 fa2f15400ab70a95082af518481861831b2fb831..3c164d90e067df605505bd1bb82a336c851446db 100644 (file)
--- 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "devel"
 PRIORITY = "optional"
-DEPENDS = "gettext bison-native"
+DEPENDS = "bison-native"
 
-PR = "r1"
+PR = "r2"
 
 BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-          file://m4.patch;patch=1"
+          file://m4.patch \
+          file://uclibc-sched_param-def.patch \
+         "
 
 SRC_URI = "${BASE_SRC_URI} \
         file://fix_cross_manpage_building.patch "
@@ -24,7 +26,7 @@ SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65
 DEPENDS_virtclass-native = "gettext-native"
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
 
-inherit autotools
+inherit autotools gettext
 acpaths = "-I ${S}/m4"
 
 do_install_append_virtclass-native() {