From 8aa07da69f4966afda40d77b1e8b83749c5d1c28 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 23 May 2011 15:40:04 -0700 Subject: bison: upgrade from 2.4.3 to 2.5 This version of bison needs m4 1.4.16 or newer Signed-off-by: Nitin A Kamble --- meta/recipes-devtools/bison/bison/m4.patch | 131 --------------------- .../bison/bison/uclibc-sched_param-def.patch | 21 ---- meta/recipes-devtools/bison/bison_2.4.3.bb | 38 ------ meta/recipes-devtools/bison/bison_2.5.bb | 37 ++++++ 4 files changed, 37 insertions(+), 190 deletions(-) delete mode 100644 meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch delete mode 100644 meta/recipes-devtools/bison/bison_2.4.3.bb create mode 100644 meta/recipes-devtools/bison/bison_2.5.bb (limited to 'meta/recipes-devtools') 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 + if and don't define.]) + fi +]) -Index: bison-2.4.2/m4/glibc21.m4 -=================================================================== ---- /dev/null -+++ bison-2.4.2/m4/glibc21.m4 -@@ -0,0 +1,32 @@ -+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# Test for the GNU C Library, version 2.1 or newer. -+# From Bruno Haible. -+ -+AC_DEFUN([jm_GLIBC21], -+ [ -+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, -+ ac_cv_gnu_library_2_1, -+ [AC_EGREP_CPP([Lucky GNU user], -+ [ -+#include -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) -+ Lucky GNU user -+ #endif -+#endif -+ ], -+ ac_cv_gnu_library_2_1=yes, -+ ac_cv_gnu_library_2_1=no) -+ ] -+ ) -+ AC_SUBST(GLIBC21) -+ GLIBC21="$ac_cv_gnu_library_2_1" -+ ] -+) -Index: bison-2.4.2/m4/stdint_h.m4 -=================================================================== ---- /dev/null -+++ bison-2.4.2/m4/stdint_h.m4 -@@ -0,0 +1,28 @@ -+# stdint_h.m4 serial 2 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_STDINT_H], -+[ -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) -Index: bison-2.4.2/m4/inttypes_h.m4 -=================================================================== ---- /dev/null -+++ bison-2.4.2/m4/inttypes_h.m4 -@@ -0,0 +1,28 @@ -+# inttypes_h.m4 serial 4 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) Index: bison-2.4.2/m4/ulonglong.m4 =================================================================== --- /dev/null @@ -206,34 +103,6 @@ Index: bison-2.4.2/m4/ulonglong.m4 + [Define if you have the unsigned long long type.]) + fi +]) -Index: bison-2.4.2/m4/codeset.m4 -=================================================================== ---- /dev/null -+++ bison-2.4.2/m4/codeset.m4 -@@ -0,0 +1,23 @@ -+# codeset.m4 serial AM1 (gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([AM_LANGINFO_CODESET], -+[ -+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, -+ [AC_TRY_LINK([#include ], -+ [char* cs = nl_langinfo(CODESET);], -+ am_cv_langinfo_codeset=yes, -+ am_cv_langinfo_codeset=no) -+ ]) -+ if test $am_cv_langinfo_codeset = yes; then -+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1, -+ [Define if you have and nl_langinfo(CODESET).]) -+ fi -+]) Index: bison-2.4.2/m4/intdiv0.m4 =================================================================== --- /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 @@ -Upstream-Status: Pending - -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 - # include - #endif diff --git a/meta/recipes-devtools/bison/bison_2.4.3.bb b/meta/recipes-devtools/bison/bison_2.4.3.bb deleted file mode 100644 index 3c164d90e0..0000000000 --- a/meta/recipes-devtools/bison/bison_2.4.3.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "GNU Project parser generator (yacc replacement)." -DESCRIPTION = "Bison is a general-purpose parser generator that converts an annotated context-free grammar into \ -an LALR(1) or GLR parser for that grammar. Bison is upward compatible with Yacc: all properly-written Yacc \ -grammars ought to work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with \ -little trouble." -HOMEPAGE = "http://www.gnu.org/software/bison/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SECTION = "devel" -PRIORITY = "optional" -DEPENDS = "bison-native" - -PR = "r2" - -BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ - file://m4.patch \ - file://uclibc-sched_param-def.patch \ - " - -SRC_URI = "${BASE_SRC_URI} \ - file://fix_cross_manpage_building.patch " - -SRC_URI[md5sum] = "ea45c778b36bdc7a720096819e292a73" -SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65179b16" - -DEPENDS_virtclass-native = "gettext-native" -SRC_URI_virtclass-native = "${BASE_SRC_URI}" - -inherit autotools gettext -acpaths = "-I ${S}/m4" - -do_install_append_virtclass-native() { - create_wrapper ${D}/${bindir}/bison \ - M4=${STAGING_BINDIR_NATIVE}/m4 \ - BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison -} -#bison-native encodes the staging M4 path -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/bison/bison_2.5.bb b/meta/recipes-devtools/bison/bison_2.5.bb new file mode 100644 index 0000000000..b81efab74e --- /dev/null +++ b/meta/recipes-devtools/bison/bison_2.5.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNU Project parser generator (yacc replacement)." +DESCRIPTION = "Bison is a general-purpose parser generator that converts an annotated context-free grammar into \ +an LALR(1) or GLR parser for that grammar. Bison is upward compatible with Yacc: all properly-written Yacc \ +grammars ought to work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with \ +little trouble." +HOMEPAGE = "http://www.gnu.org/software/bison/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "devel" +PRIORITY = "optional" +DEPENDS = "bison-native" + +PR = "r0" + +BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ + file://m4.patch \ + " + +SRC_URI = "${BASE_SRC_URI} \ + file://fix_cross_manpage_building.patch " + +SRC_URI[md5sum] = "687e1dcd29452789d34eaeea4c25abe4" +SRC_URI[sha256sum] = "722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99" + +DEPENDS_virtclass-native = "gettext-native" +SRC_URI_virtclass-native = "${BASE_SRC_URI}" + +inherit autotools gettext +acpaths = "-I ${S}/m4" + +do_install_append_virtclass-native() { + create_wrapper ${D}/${bindir}/bison \ + M4=${STAGING_BINDIR_NATIVE}/m4 \ + BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison +} +#bison-native encodes the staging M4 path +BBCLASSEXTEND = "native" -- cgit v1.2.3