From 59bbf308c28e841d0c91d8d01bf9cd31987c2b8a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 31 May 2020 17:52:37 +0200 Subject: [PATCH] bison: 3.5.4 -> 3.6.2 Drop dont-depend-on-help2man.patch.patch, as pre-build manpages are already packaged into source tarballs. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../bison/dont-depend-on-help2man.patch.patch | 44 ------------------- .../bison/{bison_3.5.4.bb => bison_3.6.2.bb} | 5 +-- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch rename meta/recipes-devtools/bison/{bison_3.5.4.bb => bison_3.6.2.bb} (91%) diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch deleted file mode 100644 index 8a41a3a762..0000000000 --- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 31bb81ef15c42b10844eb8af8738f672076edf0e Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist -Date: Tue, 21 Apr 2015 00:48:45 -0700 -Subject: [PATCH] doc/local.mk: dont-depend-on-help2man.patch - -Upstream-Status: Inappropriate - -Signed-off-by: Marko Lindqvist - -Updated for bison 3.0.4 - -Signed-off-by: Robert Yang - ---- - doc/local.mk | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/doc/local.mk b/doc/local.mk -index d12836e..f9bf332 100644 ---- a/doc/local.mk -+++ b/doc/local.mk -@@ -101,10 +101,7 @@ endif ! CROSS_COMPILING - ## Man Pages. ## - ## ----------- ## - --dist_man_MANS = $(top_srcdir)/doc/bison.1 -- --EXTRA_DIST += $(dist_man_MANS:.1=.x) --MAINTAINERCLEANFILES += $(dist_man_MANS) -+EXTRA_DIST += bison.x - - # Differences to ignore when comparing the man page (the date). - remove_time_stamp = \ -@@ -127,10 +124,6 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS) - fi - $(AM_V_at)rm -f $@*.tmp - --if ENABLE_YACC --nodist_man_MANS = doc/yacc.1 --endif -- - ## ----------------------------- ## - ## Graphviz examples generation. ## - ## ----------------------------- ## diff --git a/meta/recipes-devtools/bison/bison_3.5.4.bb b/meta/recipes-devtools/bison/bison_3.6.2.bb similarity index 91% rename from meta/recipes-devtools/bison/bison_3.5.4.bb rename to meta/recipes-devtools/bison/bison_3.6.2.bb index 124bc41d3e..2ec9381231 100644 --- a/meta/recipes-devtools/bison/bison_3.5.4.bb +++ b/meta/recipes-devtools/bison/bison_3.6.2.bb @@ -10,11 +10,10 @@ SECTION = "devel" DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ - file://dont-depend-on-help2man.patch.patch \ file://add-with-bisonlocaledir.patch \ file://0001-bison-fix-the-parallel-build.patch \ -" -SRC_URI[sha256sum] = "4c17e99881978fa32c05933c5262457fa5b2b611668454f8dc2a695cd6b3720c" + " +SRC_URI[sha256sum] = "4a164b5cc971b896ce976bf4b624fab7279e0729cf983a5135df7e4df0970f6e" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -- 2.40.1