diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /package/bison | |
parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/bison')
-rw-r--r-- | package/bison/bison-2.4.3-uclibc-sched_param-def.patch | 19 | ||||
-rw-r--r-- | package/bison/bison.mk | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/package/bison/bison-2.4.3-uclibc-sched_param-def.patch b/package/bison/bison-2.4.3-uclibc-sched_param-def.patch deleted file mode 100644 index 50652d8ba..000000000 --- a/package/bison/bison-2.4.3-uclibc-sched_param-def.patch +++ /dev/null @@ -1,19 +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 - -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/package/bison/bison.mk b/package/bison/bison.mk index d365e33cd..759592e16 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -4,7 +4,7 @@ # ############################################################# -BISON_VERSION = 2.4.3 +BISON_VERSION = 2.5 BISON_SITE = $(BR2_GNU_MIRROR)/bison define BISON_DISABLE_EXAMPLES |