[oe-commits] Robert Yang : bison: don't depend on help2man
git at git.openembedded.org
git at git.openembedded.org
Tue Apr 21 11:48:21 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 166f2587468ae71988c610858aad3f7ef67eccba
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=166f2587468ae71988c610858aad3f7ef67eccba
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Tue Apr 21 02:04:01 2015 -0700
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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../bison/dont-depend-on-help2man.patch.patch | 46 ++++++++++++++++++++++
meta/recipes-devtools/bison/bison_3.0.4.bb | 1 +
2 files changed, 47 insertions(+)
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 0000000..ac16c57
--- /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 at 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 at gmail.com>
+
+Updated for bison 3.0.4
+
+Signed-off-by: Robert Yang <liezhi.yang at 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 5061410..de29506 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
More information about the Openembedded-commits
mailing list