[oe-commits] Marko Lindqvist : texinfo: remove help2man dependency

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 2c8cebdfd8102d4386b5d42a7fc30cc81e8e2ef2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2c8cebdfd8102d4386b5d42a7fc30cc81e8e2ef2

Author: Marko Lindqvist <cazfi74 at gmail.com>
Date:   Mon Feb 11 06:00:48 2013 +0200

texinfo: remove help2man dependency

Remove manpage creation. It wasn't working because of help2man
missing when texinfo 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 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../texinfo-4.13a/dont-depend-on-help2man.patch    |   79 ++++++++++++++++++++
 meta/recipes-extended/texinfo/texinfo_4.13a.bb     |    3 +-
 2 files changed, 81 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/dont-depend-on-help2man.patch
new file mode 100644
index 0000000..13e0fc2
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/dont-depend-on-help2man.patch
@@ -0,0 +1,79 @@
+Upstream-Status: Inappropŕiate
+
+Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
+diff -Nurd texinfo-4.13/doc/Makefile.am texinfo-4.13/doc/Makefile.am
+--- texinfo-4.13/doc/Makefile.am	2008-09-18 21:31:56.000000000 +0300
++++ texinfo-4.13/doc/Makefile.am	2013-02-08 03:13:40.943466946 +0200
+@@ -14,9 +14,6 @@
+ info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
+ DISTCLEANFILES = texinfo texinfo-* info*.info*
+
+-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1  \
+-           info.5 texinfo.5
+-
+ # Use the programs built in our distribution, taking account of possible
+ # cross-compiling.
+ MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
+@@ -36,7 +33,7 @@
+ # Include our texinfo.tex, not Automake's.
+ EXTRA_DIST = epsf.tex texinfo.tex \
+              fdl.texi \
+-	     $(man_MANS) $(TXI_XLATE)
++	     $(TXI_XLATE)
+	     $(refcard_files)
+
+ if INSTALL_WARNINGS
+@@ -77,38 +74,10 @@
+	case $$program in info|install-info) program=g$$program;; \
+		esac
+
+-# Update the manpage for a binary program; set up the variables,
+-# make sure the binary is up-to-date and then generate the man page.
+-man_rule_bin = echo "Updating man page $@" && \
+-	$(man_rule_0) && \
+-	echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
+-	    (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
+-	echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" -o '$@' && \
+-	     $(HELP2MAN) --name="$$name"     "$$dir/$$program" -o '$@'
+-
+-$(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
+-	@name="read Info documents" && $(man_rule_bin)
+-$(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
+-	@name="compile customizations for Info" && $(man_rule_bin)
+-$(srcdir)/install-info.1: $(top_srcdir)/install-info/install-info.c $(common_mandeps)
+-	@name="update info/dir entries" && $(man_rule_bin)
+-
+-# Here we need some postprocessing:
+-$(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
+-	@name="translate Texinfo documents" && $(man_rule_bin)
+-	mv $@ $@.tmp
+-	sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' $@.tmp >$@
+-	rm $@.tmp
+-
+-$(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
+-	@name="sort Texinfo index files" && $(man_rule_bin)
+-
+-
+ ## ---------- ##
+ ## texi2dvi.  ##
+ ## ---------- ##
+
+-man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
+ util_srcdir = $(top_srcdir)/util
+
+ # Do not depend on the current user's settings.
+@@ -119,14 +88,5 @@
+ common_texi2dvi_deps = $(common_mandeps) \
+                        $(util_srcdir)/texi2dvi $(util_srcdir)/texi2pdf
+
+-$(srcdir)/texi2dvi.1: $(common_texi2dvi_deps)
+-	$(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@
+-
+-$(srcdir)/texi2pdf.1: $(common_texi2dvi_deps)
+-	$(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@
+-
+-$(srcdir)/pdftexi2dvi.1:  $(common_texi2dvi_deps)
+-	$(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@
+-
+ # Do not create info files for distribution.
+ dist-info:
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index 327faab..960cc5e 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/texinfo/"
 SECTION = "console/utils"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "zlib ncurses texinfo-native"
 DEPENDS_class-native = "zlib-native ncurses-native"
@@ -24,6 +24,7 @@ SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
            file://link-zip.patch \
            file://gettext-macros.patch \
            file://texinfo_fix_for_automake-1.12.patch \
+           file://dont-depend-on-help2man.patch \
            ${TARGET_PATCH}"
 
 SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"