diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-21 02:04:01 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-21 13:59:21 +0100 |
commit | 781165b071babb888f46a4e1d15880df924c65f6 (patch) | |
tree | 4a50e1a7f24fb7dee23d4833f42f7d98747dca29 /meta | |
parent | fc15878af46c09512fc3cb73480359fcbb22e627 (diff) | |
download | poky-781165b071babb888f46a4e1d15880df924c65f6.tar.gz |
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
(From OE-Core rev: 166f2587468ae71988c610858aad3f7ef67eccba)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/bison/bison_3.0.4.bb | 1 |
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 @@ | |||
1 | From 4c0d7733f30903f8d7c7cd7433f5c8a7505e35f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Marko Lindqvist <cazfi74@gmail.com> | ||
3 | Date: Tue, 21 Apr 2015 00:48:45 -0700 | ||
4 | Subject: [PATCH] doc/local.mk: dont-depend-on-help2man.patch | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
9 | |||
10 | Updated for bison 3.0.4 | ||
11 | |||
12 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | --- | ||
14 | doc/local.mk | 9 +-------- | ||
15 | 1 file changed, 1 insertion(+), 8 deletions(-) | ||
16 | |||
17 | diff --git a/doc/local.mk b/doc/local.mk | ||
18 | index c340452..642f385 100644 | ||
19 | --- a/doc/local.mk | ||
20 | +++ b/doc/local.mk | ||
21 | @@ -98,10 +98,7 @@ endif ! CROSS_COMPILING | ||
22 | ## Man Pages. ## | ||
23 | ## ----------- ## | ||
24 | |||
25 | -dist_man_MANS = $(top_srcdir)/doc/bison.1 | ||
26 | - | ||
27 | -EXTRA_DIST += $(dist_man_MANS:.1=.x) | ||
28 | -MAINTAINERCLEANFILES += $(dist_man_MANS) | ||
29 | +EXTRA_DIST += bison.x | ||
30 | |||
31 | # Differences to ignore when comparing the man page (the date). | ||
32 | remove_time_stamp = \ | ||
33 | @@ -124,10 +121,6 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS) | ||
34 | fi | ||
35 | $(AM_V_at)rm -f $@*.t | ||
36 | |||
37 | -if ENABLE_YACC | ||
38 | -nodist_man_MANS = doc/yacc.1 | ||
39 | -endif | ||
40 | - | ||
41 | ## ----------------------------- ## | ||
42 | ## Graphviz examples generation. ## | ||
43 | ## ----------------------------- ## | ||
44 | -- | ||
45 | 1.7.9.5 | ||
46 | |||
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" | |||
12 | SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ | 12 | SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ |
13 | file://m4.patch \ | 13 | file://m4.patch \ |
14 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | 14 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ |
15 | file://dont-depend-on-help2man.patch.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | # No point in hardcoding path to m4, just use PATH | 18 | # No point in hardcoding path to m4, just use PATH |