From 8030c3f26431d33c39a50b8fbdcd15ee390fae11 Mon Sep 17 00:00:00 2001
From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Date: Mon, 30 Jul 2012 16:51:17 +0300
Subject: bison: updated to 2.5.1

The gets patch is not needed anymore in this version. The
manpage patch was updated for this version.

(From OE-Core rev: 2f11d409e20d90f2d619b4d92495c3fcd30584ab)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../bison/bison/fix_cross_manpage_building.patch   | 15 ++++-----
 meta/recipes-devtools/bison/bison_2.5.1.bb         | 36 ++++++++++++++++++++
 meta/recipes-devtools/bison/bison_2.5.bb           | 39 ----------------------
 3 files changed, 43 insertions(+), 47 deletions(-)
 create mode 100644 meta/recipes-devtools/bison/bison_2.5.1.bb
 delete mode 100644 meta/recipes-devtools/bison/bison_2.5.bb

diff --git a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
index 126cbaa1ac..8b683793eb 100644
--- a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
+++ b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
@@ -5,16 +5,15 @@ help2man is looking at the generated binary for help output. This does not work
 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
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c7f2755..af9453a 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -80,7 +80,6 @@ PREPATH = $(top_builddir)/src
+ 	  echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program &&	\
  	  (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit;	\
  	done
- 	@echo "Updating man page $@"
--	PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";			     \
-+#	PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";			     
+-	$(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";		     \
  	export PATH;							     \
  	$(HELP2MAN)							     \
  	    --include=$*.x						     \
diff --git a/meta/recipes-devtools/bison/bison_2.5.1.bb b/meta/recipes-devtools/bison/bison_2.5.1.bb
new file mode 100644
index 0000000000..d53c1d64a3
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison_2.5.1.bb
@@ -0,0 +1,36 @@
+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"
+DEPENDS = "bison-native flex-native"
+
+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] = "8fedf916f1aa2c4a31441d8f8bbc603c"
+SRC_URI[sha256sum] = "48dc3649231b75ac160d73528000ec89b6cd8d3b87cb7d0713f72ef4610442d4"
+
+LDFLAGS_prepend_libc-uclibc = " -lrt "
+DEPENDS_virtclass-native = "gettext-minimal-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
deleted file mode 100644
index 50283003de..0000000000
--- a/meta/recipes-devtools/bison/bison_2.5.bb
+++ /dev/null
@@ -1,39 +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"
-DEPENDS = "bison-native flex-native"
-
-PR = "r3"
-
-BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch \
-           file://remove-gets.patch \
-	  "
-
-SRC_URI = "${BASE_SRC_URI} \
-           file://fix_cross_manpage_building.patch \
-          "
-
-SRC_URI[md5sum] = "687e1dcd29452789d34eaeea4c25abe4"
-SRC_URI[sha256sum] = "722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99"
-
-LDFLAGS_prepend_libc-uclibc = " -lrt "
-DEPENDS_virtclass-native = "gettext-minimal-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-54-g00ecf