summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-23 15:40:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-06 15:58:39 +0100
commit90d5d3ca116fc4d0a6412fbb66282ec1c0996dd3 (patch)
treed43beb0e4d232db16f1ef16fc071d901daad3afe
parentd0c2307bca5e98c7ff7bbef9867cebce7b8aeafa (diff)
downloadpoky-90d5d3ca116fc4d0a6412fbb66282ec1c0996dd3.tar.gz
bison: upgrade from 2.4.3 to 2.5
This version of bison needs m4 1.4.16 or newer (From OE-Core rev: 8aa07da69f4966afda40d77b1e8b83749c5d1c28) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/bison/bison/m4.patch131
-rw-r--r--meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch21
-rw-r--r--meta/recipes-devtools/bison/bison_2.5.bb (renamed from meta/recipes-devtools/bison/bison_2.4.3.bb)7
3 files changed, 3 insertions, 156 deletions
diff --git a/meta/recipes-devtools/bison/bison/m4.patch b/meta/recipes-devtools/bison/bison/m4.patch
index 0754a90dcd..d139da5e79 100644
--- a/meta/recipes-devtools/bison/bison/m4.patch
+++ b/meta/recipes-devtools/bison/bison/m4.patch
@@ -75,109 +75,6 @@ Index: bison-2.4.2/m4/uintmax_t.m4
75+ if <inttypes.h> and <stdint.h> don't define.]) 75+ if <inttypes.h> and <stdint.h> don't define.])
76+ fi 76+ fi
77+]) 77+])
78Index: bison-2.4.2/m4/glibc21.m4
79===================================================================
80--- /dev/null
81+++ bison-2.4.2/m4/glibc21.m4
82@@ -0,0 +1,32 @@
83+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
84+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
85+dnl This file is free software, distributed under the terms of the GNU
86+dnl General Public License. As a special exception to the GNU General
87+dnl Public License, this file may be distributed as part of a program
88+dnl that contains a configuration script generated by Autoconf, under
89+dnl the same distribution terms as the rest of that program.
90+
91+# Test for the GNU C Library, version 2.1 or newer.
92+# From Bruno Haible.
93+
94+AC_DEFUN([jm_GLIBC21],
95+ [
96+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
97+ ac_cv_gnu_library_2_1,
98+ [AC_EGREP_CPP([Lucky GNU user],
99+ [
100+#include <features.h>
101+#ifdef __GNU_LIBRARY__
102+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
103+ Lucky GNU user
104+ #endif
105+#endif
106+ ],
107+ ac_cv_gnu_library_2_1=yes,
108+ ac_cv_gnu_library_2_1=no)
109+ ]
110+ )
111+ AC_SUBST(GLIBC21)
112+ GLIBC21="$ac_cv_gnu_library_2_1"
113+ ]
114+)
115Index: bison-2.4.2/m4/stdint_h.m4
116===================================================================
117--- /dev/null
118+++ bison-2.4.2/m4/stdint_h.m4
119@@ -0,0 +1,28 @@
120+# stdint_h.m4 serial 2 (gettext-0.11.4)
121+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
122+dnl This file is free software, distributed under the terms of the GNU
123+dnl General Public License. As a special exception to the GNU General
124+dnl Public License, this file may be distributed as part of a program
125+dnl that contains a configuration script generated by Autoconf, under
126+dnl the same distribution terms as the rest of that program.
127+
128+dnl From Paul Eggert.
129+
130+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
131+# doesn't clash with <sys/types.h>, and declares uintmax_t.
132+
133+AC_DEFUN([jm_AC_HEADER_STDINT_H],
134+[
135+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
136+ [AC_TRY_COMPILE(
137+ [#include <sys/types.h>
138+#include <stdint.h>],
139+ [uintmax_t i = (uintmax_t) -1;],
140+ jm_ac_cv_header_stdint_h=yes,
141+ jm_ac_cv_header_stdint_h=no)])
142+ if test $jm_ac_cv_header_stdint_h = yes; then
143+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
144+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
145+ and declares uintmax_t. ])
146+ fi
147+])
148Index: bison-2.4.2/m4/inttypes_h.m4
149===================================================================
150--- /dev/null
151+++ bison-2.4.2/m4/inttypes_h.m4
152@@ -0,0 +1,28 @@
153+# inttypes_h.m4 serial 4 (gettext-0.11.4)
154+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
155+dnl This file is free software, distributed under the terms of the GNU
156+dnl General Public License. As a special exception to the GNU General
157+dnl Public License, this file may be distributed as part of a program
158+dnl that contains a configuration script generated by Autoconf, under
159+dnl the same distribution terms as the rest of that program.
160+
161+dnl From Paul Eggert.
162+
163+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
164+# doesn't clash with <sys/types.h>, and declares uintmax_t.
165+
166+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
167+[
168+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
169+ [AC_TRY_COMPILE(
170+ [#include <sys/types.h>
171+#include <inttypes.h>],
172+ [uintmax_t i = (uintmax_t) -1;],
173+ jm_ac_cv_header_inttypes_h=yes,
174+ jm_ac_cv_header_inttypes_h=no)])
175+ if test $jm_ac_cv_header_inttypes_h = yes; then
176+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
177+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
178+ and declares uintmax_t. ])
179+ fi
180+])
181Index: bison-2.4.2/m4/ulonglong.m4 78Index: bison-2.4.2/m4/ulonglong.m4
182=================================================================== 79===================================================================
183--- /dev/null 80--- /dev/null
@@ -206,34 +103,6 @@ Index: bison-2.4.2/m4/ulonglong.m4
206+ [Define if you have the unsigned long long type.]) 103+ [Define if you have the unsigned long long type.])
207+ fi 104+ fi
208+]) 105+])
209Index: bison-2.4.2/m4/codeset.m4
210===================================================================
211--- /dev/null
212+++ bison-2.4.2/m4/codeset.m4
213@@ -0,0 +1,23 @@
214+# codeset.m4 serial AM1 (gettext-0.10.40)
215+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
216+dnl This file is free software, distributed under the terms of the GNU
217+dnl General Public License. As a special exception to the GNU General
218+dnl Public License, this file may be distributed as part of a program
219+dnl that contains a configuration script generated by Autoconf, under
220+dnl the same distribution terms as the rest of that program.
221+
222+dnl From Bruno Haible.
223+
224+AC_DEFUN([AM_LANGINFO_CODESET],
225+[
226+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
227+ [AC_TRY_LINK([#include <langinfo.h>],
228+ [char* cs = nl_langinfo(CODESET);],
229+ am_cv_langinfo_codeset=yes,
230+ am_cv_langinfo_codeset=no)
231+ ])
232+ if test $am_cv_langinfo_codeset = yes; then
233+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
234+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
235+ fi
236+])
237Index: bison-2.4.2/m4/intdiv0.m4 106Index: bison-2.4.2/m4/intdiv0.m4
238=================================================================== 107===================================================================
239--- /dev/null 108--- /dev/null
diff --git a/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
deleted file mode 100644
index 6774838ba8..0000000000
--- a/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Pending
2
3uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
4and is not needed too per standard. gnulib attempts to use it but we have to account
5for it because in this case uclibc does not behave like glibc.
6
7-Khem
8
9http://bugs.gentoo.org/336484
10
11--- m4-1.4.14/lib/spawn.in.h
12+++ m4-1.4.14/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-devtools/bison/bison_2.4.3.bb b/meta/recipes-devtools/bison/bison_2.5.bb
index 3c164d90e0..b81efab74e 100644
--- a/meta/recipes-devtools/bison/bison_2.4.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.5.bb
@@ -10,18 +10,17 @@ SECTION = "devel"
10PRIORITY = "optional" 10PRIORITY = "optional"
11DEPENDS = "bison-native" 11DEPENDS = "bison-native"
12 12
13PR = "r2" 13PR = "r0"
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 \ 16 file://m4.patch \
17 file://uclibc-sched_param-def.patch \
18 " 17 "
19 18
20SRC_URI = "${BASE_SRC_URI} \ 19SRC_URI = "${BASE_SRC_URI} \
21 file://fix_cross_manpage_building.patch " 20 file://fix_cross_manpage_building.patch "
22 21
23SRC_URI[md5sum] = "ea45c778b36bdc7a720096819e292a73" 22SRC_URI[md5sum] = "687e1dcd29452789d34eaeea4c25abe4"
24SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65179b16" 23SRC_URI[sha256sum] = "722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99"
25 24
26DEPENDS_virtclass-native = "gettext-native" 25DEPENDS_virtclass-native = "gettext-native"
27SRC_URI_virtclass-native = "${BASE_SRC_URI}" 26SRC_URI_virtclass-native = "${BASE_SRC_URI}"