From 6787dbc5f391f7fd0b27965cf5985107561f16b0 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 14 Apr 2015 02:07:12 -0700 Subject: bison: 2.7.1 -> 3.0.4 * Based on Chong Lu's previous upgrade to 3.0.2 * Remove unneeded patches: dont-depend-on-help2man.patch and fix_cross_manpage_building.patch (From OE-Core rev: fbb26d8db8e71fd979edd2bafa7e0bab7632950c) Signed-off-by: Chong Lu Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../bison/bison/dont-depend-on-help2man.patch | 32 ---------------------- .../bison/bison/fix_cross_manpage_building.patch | 19 ------------- 2 files changed, 51 deletions(-) delete mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch (limited to 'meta/recipes-devtools/bison/bison') diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch deleted file mode 100644 index 21b44bf79c..0000000000 --- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Inappropriate - -Signed-off-by: Marko Lindqvist -diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am ---- bison-2.7/doc/Makefile.am 2012-12-09 17:51:03.000000000 +0200 -+++ bison-2.7/doc/Makefile.am 2013-01-02 06:49:50.804894071 +0200 -@@ -52,15 +52,11 @@ - ## Man Pages. ## - ## ----------- ## - --dist_man_MANS = $(srcdir)/bison.1 -- --EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x --MAINTAINERCLEANFILES += $(dist_man_MANS) -+EXTRA_DIST += bison.x common.x - - # Depend on configure to get version number changes. - common_dep = $(top_srcdir)/configure $(srcdir)/common.x - srcsrcdir = $(top_srcdir)/bin --$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c - - # Differences to ignore when comparing the man page (the date). - remove_time_stamp = \ -@@ -94,8 +90,6 @@ - fi - $(AM_V_at)rm -f $@*.t - --nodist_man_MANS = yacc.1 -- - ## ------------------------------ ## - ## Graphviz examples generation. ## - ## ------------------------------ ## diff --git a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch deleted file mode 100644 index 8b683793eb..0000000000 --- a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -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 - -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 -- $(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \ - export PATH; \ - $(HELP2MAN) \ - --include=$*.x \ -- cgit v1.2.3-54-g00ecf