diff options
author | Ross Burton <ross.burton@intel.com> | 2019-09-09 13:23:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-15 17:49:47 +0100 |
commit | 698efe108de724d9129ca938151ab7c7d3cb34cc (patch) | |
tree | fae4d022c46b2eb0c00125948e92702f95907f77 /meta/recipes-support/gnutls | |
parent | 7df9aa52446a031c10e84f321733a0e56f563e85 (diff) | |
download | openembedded-core-contrib-698efe108de724d9129ca938151ab7c7d3cb34cc.tar.gz |
libtasn1: fix build with api-documentation enabled
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch | 38 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1_4.14.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch new file mode 100644 index 0000000000..bfc9b9fca7 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch @@ -0,0 +1,38 @@ +Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Mon, 9 Sep 2019 13:11:39 +0100 +Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter + +The object hierarchy section is empty because there are no GObjects in the +libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object +hierarchy file won't exist, resulting in a failure when building the +documentation: + +| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found + +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + doc/reference/libtasn1-docs.xml | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml +index accdb85..f88b888 100644 +--- a/doc/reference/libtasn1-docs.xml ++++ b/doc/reference/libtasn1-docs.xml +@@ -34,10 +34,6 @@ + <xi:include href="xml/libtasn1.xml"/> + + </chapter> +- <chapter id="object-tree"> +- <title>Object Hierarchy</title> +- <xi:include href="xml/tree_index.sgml"/> +- </chapter> + <index id="api-index-full"> + <title>API Index</title> + <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> +-- +2.20.1 + diff --git a/meta/recipes-support/gnutls/libtasn1_4.14.bb b/meta/recipes-support/gnutls/libtasn1_4.14.bb index 7158e483e9..ef2c1956a2 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.14.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.14.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ file://fix-ldflags.patch \ + file://fix-gtkdoc.patch \ " DEPENDS = "bison-native" |