From: Marko Lindqvist <cazfi74@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 03/15] bison: remove help2man dependency
Date: Mon, 7 Jan 2013 01:49:29 +0200 [thread overview]
Message-ID: <1357516181-5358-4-git-send-email-cazfi74@gmail.com> (raw)
In-Reply-To: <1357516181-5358-3-git-send-email-cazfi74@gmail.com>
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
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 \
--
1.7.10.4
next prev parent reply other threads:[~2013-01-07 0:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 23:49 Prepare recipes for automake-1.13 (batch 1 / v2) Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 02/15] libtool: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` Marko Lindqvist [this message]
2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 15/15] flac: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie
2013-01-07 12:11 ` Marko Lindqvist
2013-01-07 12:16 ` Burton, Ross
2013-01-07 12:18 ` Otavio Salvador
2013-01-07 13:46 ` Richard Purdie
2013-01-07 15:58 ` Otavio Salvador
2013-01-07 16:26 ` Marko Lindqvist
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357516181-5358-4-git-send-email-cazfi74@gmail.com \
--to=cazfi74@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.