bison: upgrade from 2.3 to 2.4.2

Fixed a configure issue by adding acpaths line in the recipe.

fix_cross_manpage_building.patch: Created this patch to avoid the build
issue for non-x86 targets.

Rebased the m4.patch for the latest code, by removing duplicate
functionality.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
Nitin A Kamble 2010-06-23 06:38:40 -07:00 committed by Richard Purdie
parent 87381753d4
commit 64b82f8acd
4 changed files with 70 additions and 90 deletions

View File

@ -0,0 +1,18 @@
help2man is looking at the generated binary for help output. This does not work for cross compilations. So taking out the local PREPATH (../src) directory from path so that help2 man can find the native version of the bison in the native sysroot directory.
Date: 2010/06/28
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Index: bison-2.4.2/doc/Makefile.am
===================================================================
--- bison-2.4.2.orig/doc/Makefile.am
+++ bison-2.4.2/doc/Makefile.am
@@ -77,7 +77,7 @@ PREPATH = $(top_builddir)/src
(cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \
done
@echo "Updating man page $@"
- PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \
+# PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";
export PATH; \
$(HELP2MAN) \
--include=$*.x \

View File

@ -3,43 +3,10 @@
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
Index: bison-2.4.2/m4/lcmessage.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/inttypes-pri.m4
@@ -0,0 +1,32 @@
+# inttypes-pri.m4 serial 1 (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 Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values. This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
+ if test $gt_cv_header_inttypes_h = yes; then
+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+ gt_cv_inttypes_pri_broken,
+ [
+ AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+ ])
+ fi
+ if test "$gt_cv_inttypes_pri_broken" = yes; then
+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+ fi
+])
--- /dev/null
+++ bison-1.875/m4/lcmessage.m4
+++ bison-2.4.2/m4/lcmessage.m4
@@ -0,0 +1,32 @@
+# lcmessage.m4 serial 3 (gettext-0.11.3)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
@ -73,8 +40,10 @@
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+])
Index: bison-2.4.2/m4/uintmax_t.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/uintmax_t.m4
+++ bison-2.4.2/m4/uintmax_t.m4
@@ -0,0 +1,29 @@
+# uintmax_t.m4 serial 6 (gettext-0.11)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
@ -105,8 +74,10 @@
+ if <inttypes.h> and <stdint.h> don't define.])
+ fi
+])
Index: bison-2.4.2/m4/glibc21.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/glibc21.m4
+++ 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.
@ -140,8 +111,10 @@
+ GLIBC21="$ac_cv_gnu_library_2_1"
+ ]
+)
Index: bison-2.4.2/m4/stdint_h.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/stdint_h.m4
+++ 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.
@ -171,8 +144,10 @@
+ and declares uintmax_t. ])
+ fi
+])
Index: bison-2.4.2/m4/inttypes_h.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/inttypes_h.m4
+++ 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.
@ -202,8 +177,10 @@
+ and declares uintmax_t. ])
+ fi
+])
Index: bison-2.4.2/m4/ulonglong.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/ulonglong.m4
+++ bison-2.4.2/m4/ulonglong.m4
@@ -0,0 +1,23 @@
+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
@ -228,8 +205,10 @@
+ [Define if you have the unsigned long long type.])
+ fi
+])
Index: bison-2.4.2/m4/codeset.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/codeset.m4
+++ 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.
@ -254,8 +233,10 @@
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+ fi
+])
Index: bison-2.4.2/m4/intdiv0.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/intdiv0.m4
+++ bison-2.4.2/m4/intdiv0.m4
@@ -0,0 +1,72 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
@ -329,8 +310,10 @@
+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+ [Define if integer division by zero raises signal SIGFPE.])
+])
Index: bison-2.4.2/m4/glib.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/glib.m4
+++ bison-2.4.2/m4/glib.m4
@@ -0,0 +1,196 @@
+# Configure paths for GLIB
+# Owen Taylor 97-11-3
@ -528,38 +511,10 @@
+ AC_SUBST(GLIB_LIBS)
+ rm -f conf.glibtest
+])
Index: bison-2.4.2/m4/isc-posix.m4
===================================================================
--- /dev/null
+++ bison-1.875/m4/inttypes.m4
@@ -0,0 +1,27 @@
+# inttypes.m4 serial 1 (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 if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+ [
+ AC_TRY_COMPILE(
+ [#include <sys/types.h>
+#include <inttypes.h>],
+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+ ])
+ if test $gt_cv_header_inttypes_h = yes; then
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+ fi
+])
--- /dev/null
+++ bison-1.875/m4/isc-posix.m4
+++ bison-2.4.2/m4/isc-posix.m4
@@ -0,0 +1,26 @@
+# isc-posix.m4 serial 2 (gettext-0.11.2)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.

View File

@ -1,15 +0,0 @@
DESCRIPTION = "GNU Project parser generator (yacc replacement)."
HOMEPAGE = "http://www.gnu.org/software/bison/"
LICENSE = "GPL"
SECTION = "devel"
PRIORITY = "optional"
DEPENDS = "gettext"
SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
file://m4.patch;patch=1"
PR = "r3"
inherit autotools
BBCLASSEXTEND = "native"

View File

@ -0,0 +1,22 @@
DESCRIPTION = "GNU Project parser generator (yacc replacement)."
HOMEPAGE = "http://www.gnu.org/software/bison/"
LICENSE = "GPL"
SECTION = "devel"
PRIORITY = "optional"
DEPENDS = "gettext bison-native"
PR = "r0"
BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
file://m4.patch;patch=1"
SRC_URI = "${BASE_SRC_URI} \
file://fix_cross_manpage_building.patch "
DEPENDS_virtclass-native = "gettext-native"
SRC_URI_virtclass-native = "${BASE_SRC_URI}"
inherit autotools
acpaths = "-I ${S}/m4"
BBCLASSEXTEND = "native"