mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d0c2307bca
commit
90d5d3ca11
@@ -75,109 +75,6 @@ Index: bison-2.4.2/m4/uintmax_t.m4
|
|||||||
+ if <inttypes.h> and <stdint.h> don't define.])
|
+ if <inttypes.h> and <stdint.h> don't define.])
|
||||||
+ fi
|
+ 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 <features.h>
|
|
||||||
+#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 <stdint.h> exists,
|
|
||||||
+# doesn't clash with <sys/types.h>, 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 <sys/types.h>
|
|
||||||
+#include <stdint.h>],
|
|
||||||
+ [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 <stdint.h> exists, doesn't clash with <sys/types.h>,
|
|
||||||
+ 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 <inttypes.h> exists,
|
|
||||||
+# doesn't clash with <sys/types.h>, 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 <sys/types.h>
|
|
||||||
+#include <inttypes.h>],
|
|
||||||
+ [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 <inttypes.h> exists, doesn't clash with <sys/types.h>,
|
|
||||||
+ and declares uintmax_t. ])
|
|
||||||
+ fi
|
|
||||||
+])
|
|
||||||
Index: bison-2.4.2/m4/ulonglong.m4
|
Index: bison-2.4.2/m4/ulonglong.m4
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
@@ -206,34 +103,6 @@ Index: bison-2.4.2/m4/ulonglong.m4
|
|||||||
+ [Define if you have the unsigned long long type.])
|
+ [Define if you have the unsigned long long type.])
|
||||||
+ fi
|
+ 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 <langinfo.h>],
|
|
||||||
+ [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 <langinfo.h> and nl_langinfo(CODESET).])
|
|
||||||
+ fi
|
|
||||||
+])
|
|
||||||
Index: bison-2.4.2/m4/intdiv0.m4
|
Index: bison-2.4.2/m4/intdiv0.m4
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /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 <sched.h>
|
|
||||||
# include <signal.h>
|
|
||||||
#endif
|
|
||||||
+3
-4
@@ -10,18 +10,17 @@ SECTION = "devel"
|
|||||||
PRIORITY = "optional"
|
PRIORITY = "optional"
|
||||||
DEPENDS = "bison-native"
|
DEPENDS = "bison-native"
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r0"
|
||||||
|
|
||||||
BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
|
BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
|
||||||
file://m4.patch \
|
file://m4.patch \
|
||||||
file://uclibc-sched_param-def.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = "${BASE_SRC_URI} \
|
SRC_URI = "${BASE_SRC_URI} \
|
||||||
file://fix_cross_manpage_building.patch "
|
file://fix_cross_manpage_building.patch "
|
||||||
|
|
||||||
SRC_URI[md5sum] = "ea45c778b36bdc7a720096819e292a73"
|
SRC_URI[md5sum] = "687e1dcd29452789d34eaeea4c25abe4"
|
||||||
SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65179b16"
|
SRC_URI[sha256sum] = "722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99"
|
||||||
|
|
||||||
DEPENDS_virtclass-native = "gettext-native"
|
DEPENDS_virtclass-native = "gettext-native"
|
||||||
SRC_URI_virtclass-native = "${BASE_SRC_URI}"
|
SRC_URI_virtclass-native = "${BASE_SRC_URI}"
|
||||||
Reference in New Issue
Block a user