Patchwork [v2,03/15] bison: remove help2man dependency

login
mail settings
Submitter Marko Lindqvist
Date Jan. 6, 2013, 11:49 p.m.
Message ID <1357516181-5358-4-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/42117/
State Accepted
Commit a2f4b4437c6d542349d2027330dc16392ed131ae
Headers show

Comments

Marko Lindqvist - Jan. 6, 2013, 11:49 p.m.
Remove manpage creation. It wasn't working because of help2man
missing when bison is being built. This attempt to create
manpages without help2man turns from no-op to hard error with
automake-1.13.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../bison/bison/dont-depend-on-help2man.patch      |   32 ++++++++++++++++++++
 meta/recipes-devtools/bison/bison_2.7.bb           |    7 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch

Patch

diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
new file mode 100644
index 0000000..21b44bf
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
@@ -0,0 +1,32 @@ 
+Upstream-Status: Inappropriate
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+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_2.7.bb b/meta/recipes-devtools/bison/bison_2.7.bb
index 9fb3884..ee2effb 100644
--- a/meta/recipes-devtools/bison/bison_2.7.bb
+++ b/meta/recipes-devtools/bison/bison_2.7.bb
@@ -9,9 +9,12 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "devel"
 DEPENDS = "bison-native flex-native"
 
+PR = "r1"
+
 BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch \
-	  "
+	        file://m4.patch \
+                file://dont-depend-on-help2man.patch \
+	       "
 
 SRC_URI = "${BASE_SRC_URI} \
            file://fix_cross_manpage_building.patch \