summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/bison
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-21 02:04:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 11:29:30 +0100
commit166f2587468ae71988c610858aad3f7ef67eccba (patch)
tree9f2983cf8df6d1d30db794ce60a58ac5f3b60cee /meta/recipes-devtools/bison
parentc9b06c79ed8a082d1b385e9f61721aeeda9bf1af (diff)
downloadopenembedded-core-166f2587468ae71988c610858aad3f7ef67eccba.tar.gz
openembedded-core-166f2587468ae71988c610858aad3f7ef67eccba.tar.bz2
openembedded-core-166f2587468ae71988c610858aad3f7ef67eccba.zip
bison: don't depend on help2man
Fix build error when no help2man on the host: tmp/work/x86_64-linux/bison-native/3.0.4-r0/bison-3.0.4/build-aux/missing: line 81: help2man: command not found Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/bison')
-rw-r--r--meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch46
-rw-r--r--meta/recipes-devtools/bison/bison_3.0.4.bb1
2 files changed, 47 insertions, 0 deletions
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
new file mode 100644
index 0000000000..ac16c5770a
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
@@ -0,0 +1,46 @@
+From 4c0d7733f30903f8d7c7cd7433f5c8a7505e35f5 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+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 <cazfi74@gmail.com>
+
+Updated for bison 3.0.4
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ doc/local.mk | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/doc/local.mk b/doc/local.mk
+index c340452..642f385 100644
+--- a/doc/local.mk
++++ b/doc/local.mk
+@@ -98,10 +98,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 = \
+@@ -124,10 +121,6 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS)
+ fi
+ $(AM_V_at)rm -f $@*.t
+
+-if ENABLE_YACC
+-nodist_man_MANS = doc/yacc.1
+-endif
+-
+ ## ----------------------------- ##
+ ## Graphviz examples generation. ##
+ ## ----------------------------- ##
+--
+1.7.9.5
+
diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
index 506141041c..de295060e9 100644
--- a/meta/recipes-devtools/bison/bison_3.0.4.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -12,6 +12,7 @@ DEPENDS = "bison-native flex-native"
SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
file://m4.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
+ file://dont-depend-on-help2man.patch.patch \
"
# No point in hardcoding path to m4, just use PATH