summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-07 01:49:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 13:48:15 +0000
commit0a9797c4c0409e26562b80f168409c3f86bc261c (patch)
tree55c9e9f3acd750469cb1b0e3a7cd1b3249b7d3bc
parenta2f4b4437c6d542349d2027330dc16392ed131ae (diff)
downloadopenembedded-core-0a9797c4c0409e26562b80f168409c3f86bc261c.tar.gz
openembedded-core-0a9797c4c0409e26562b80f168409c3f86bc261c.tar.bz2
openembedded-core-0a9797c4c0409e26562b80f168409c3f86bc261c.zip
libtasn1: remove help2man dependency
Remove manpage creation. It wasn't working because of help2man missing when libtasn1 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch14
-rw-r--r--meta/recipes-support/gnutls/libtasn1_2.14.bb3
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
new file mode 100644
index 0000000000..2ac89f3b32
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libtasn1-2.14/doc/Makefile.am libtasn1-2.14/doc/Makefile.am
+--- libtasn1-2.14/doc/Makefile.am 2012-09-24 15:08:42.000000000 +0300
++++ libtasn1-2.14/doc/Makefile.am 2013-01-03 07:35:26.702763403 +0200
+@@ -31,7 +31,7 @@
+ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
+ --no-split --number-sections --css-include=texinfo.css
+
+-dist_man_MANS = $(gdoc_MANS) asn1Parser.1 asn1Coding.1 asn1Decoding.1
++dist_man_MANS = $(gdoc_MANS)
+
+ HELP2MAN_OPTS = --info-page libtasn1
diff --git a/meta/recipes-support/gnutls/libtasn1_2.14.bb b/meta/recipes-support/gnutls/libtasn1_2.14.bb
index 3f49bfac53..68d5ddfd0b 100644
--- a/meta/recipes-support/gnutls/libtasn1_2.14.bb
+++ b/meta/recipes-support/gnutls/libtasn1_2.14.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351"
-PR = "r0"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
file://libtasn1_fix_for_automake_1.12.patch \
+ file://dont-depend-on-help2man.patch \
"
SRC_URI[md5sum] = "a08c5936f9672da9b05691785499bcc3"