aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libidn
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:13 +0000
commit46a4a696eec4d92beac1072fe6c64da1089c7cf8 (patch)
tree2e808459c4e9e1c1f33211926efbb90fcd879900 /meta/recipes-extended/libidn
parent2c8cebdfd8102d4386b5d42a7fc30cc81e8e2ef2 (diff)
downloadopenembedded-core-contrib-46a4a696eec4d92beac1072fe6c64da1089c7cf8.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. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/libidn')
-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 00000000000..0863530f29d
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am
+--- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300
++++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200
+@@ -49,15 +49,9 @@
+
+ # Man pages.
+
+-dist_man_MANS = idn.1 $(gdoc_MANS)
++dist_man_MANS = $(gdoc_MANS)
+ MAINTAINERCLEANFILES = $(dist_man_MANS)
+
+-idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \
+- $(top_srcdir)/configure.ac
+- $(HELP2MAN) \
+- --name="Internationalized Domain Names command line tool" \
+- --output=$@ $(top_builddir)/src/idn$(EXEEXT)
+-
+ # GDOC
+
+ 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 284e871a460..1d1511a595d 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 \
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \
file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb"
-PR = "r0"
+PR = "r1"
inherit pkgconfig autotools gettext
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
file://libidn_fix_for_automake-1.12.patch \
- file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch "
+ file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
+ file://dont-depend-on-help2man.patch \
+"
SRC_URI[md5sum] = "7533d14fbbb6c026a1a9eaa2179ccb69"
SRC_URI[sha256sum] = "0a2f4c71c80f8f389a99d5a26539a9be4a4ac42cd7f375aa41046660f63cc53c"