summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-07 01:49:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 13:50:40 +0000
commitb3c980c1c5c61eedcd73114c44016dafc19adc2e (patch)
tree7bb8addee65294eb9994798bcf72dd408b7ba02a
parentefcb4facc683e5c40c1ae30f99037150f7827b37 (diff)
downloadpoky-b3c980c1c5c61eedcd73114c44016dafc19adc2e.tar.gz
bison: remove help2man dependency
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. (From OE-Core rev: a2f4b4437c6d542349d2027330dc16392ed131ae) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch32
-rw-r--r--meta/recipes-devtools/bison/bison_2.7.bb7
2 files changed, 37 insertions, 2 deletions
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 0000000000..21b44bf79c
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
@@ -0,0 +1,32 @@
1Upstream-Status: Inappropriate
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am
5--- bison-2.7/doc/Makefile.am 2012-12-09 17:51:03.000000000 +0200
6+++ bison-2.7/doc/Makefile.am 2013-01-02 06:49:50.804894071 +0200
7@@ -52,15 +52,11 @@
8 ## Man Pages. ##
9 ## ----------- ##
10
11-dist_man_MANS = $(srcdir)/bison.1
12-
13-EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
14-MAINTAINERCLEANFILES += $(dist_man_MANS)
15+EXTRA_DIST += bison.x common.x
16
17 # Depend on configure to get version number changes.
18 common_dep = $(top_srcdir)/configure $(srcdir)/common.x
19 srcsrcdir = $(top_srcdir)/bin
20-$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c
21
22 # Differences to ignore when comparing the man page (the date).
23 remove_time_stamp = \
24@@ -94,8 +90,6 @@
25 fi
26 $(AM_V_at)rm -f $@*.t
27
28-nodist_man_MANS = yacc.1
29-
30 ## ------------------------------ ##
31 ## Graphviz examples generation. ##
32 ## ------------------------------ ##
diff --git a/meta/recipes-devtools/bison/bison_2.7.bb b/meta/recipes-devtools/bison/bison_2.7.bb
index 9fb38847ea..ee2effb158 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"
9SECTION = "devel" 9SECTION = "devel"
10DEPENDS = "bison-native flex-native" 10DEPENDS = "bison-native flex-native"
11 11
12PR = "r1"
13
12BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ 14BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
13 file://m4.patch \ 15 file://m4.patch \
14 " 16 file://dont-depend-on-help2man.patch \
17 "
15 18
16SRC_URI = "${BASE_SRC_URI} \ 19SRC_URI = "${BASE_SRC_URI} \
17 file://fix_cross_manpage_building.patch \ 20 file://fix_cross_manpage_building.patch \