summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-11 06:01:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-12 13:22:43 +0000
commit41042073b094b8d4a1e226452c053b767966adc0 (patch)
tree246cc54b4f845442cc8b362ac7ce087e034b6f5d
parent15b0bdc861da44c2d5eb6f9e4581b7fe69153f1d (diff)
downloadpoky-41042073b094b8d4a1e226452c053b767966adc0.tar.gz
libidn: remove help2man dependency
Remove manpage creation. It wasn't working because of help2man missing when libidn is being built. This attempt to create manpages without help2man turns from no-op to hard error with automake-1.13. (From OE-Core rev: 46a4a696eec4d92beac1072fe6c64da1089c7cf8) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch23
-rw-r--r--meta/recipes-extended/libidn/libidn_1.26.bb6
2 files changed, 27 insertions, 2 deletions
diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
new file mode 100644
index 0000000000..0863530f29
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am
5--- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300
6+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200
7@@ -49,15 +49,9 @@
8
9 # Man pages.
10
11-dist_man_MANS = idn.1 $(gdoc_MANS)
12+dist_man_MANS = $(gdoc_MANS)
13 MAINTAINERCLEANFILES = $(dist_man_MANS)
14
15-idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \
16- $(top_srcdir)/configure.ac
17- $(HELP2MAN) \
18- --name="Internationalized Domain Names command line tool" \
19- --output=$@ $(top_builddir)/src/idn$(EXEEXT)
20-
21 # GDOC
22
23 GDOC_BIN = $(srcdir)/gdoc
diff --git a/meta/recipes-extended/libidn/libidn_1.26.bb b/meta/recipes-extended/libidn/libidn_1.26.bb
index 284e871a46..1d1511a595 100644
--- a/meta/recipes-extended/libidn/libidn_1.26.bb
+++ b/meta/recipes-extended/libidn/libidn_1.26.bb
@@ -10,13 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=91146090ae24a0572879d3b48646d404 \
10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \ 11 file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \
12 file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb" 12 file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb"
13PR = "r0" 13PR = "r1"
14 14
15inherit pkgconfig autotools gettext 15inherit pkgconfig autotools gettext
16 16
17SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ 17SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
18 file://libidn_fix_for_automake-1.12.patch \ 18 file://libidn_fix_for_automake-1.12.patch \
19 file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch " 19 file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
20 file://dont-depend-on-help2man.patch \
21"
20 22
21SRC_URI[md5sum] = "7533d14fbbb6c026a1a9eaa2179ccb69" 23SRC_URI[md5sum] = "7533d14fbbb6c026a1a9eaa2179ccb69"
22SRC_URI[sha256sum] = "0a2f4c71c80f8f389a99d5a26539a9be4a4ac42cd7f375aa41046660f63cc53c" 24SRC_URI[sha256sum] = "0a2f4c71c80f8f389a99d5a26539a9be4a4ac42cd7f375aa41046660f63cc53c"