diff options
author | Ross Burton <ross.burton@intel.com> | 2019-04-02 17:52:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-03 14:56:27 +0100 |
commit | ffa5a1bda6741f5dc9f1b8db1bb37b0c6f103c99 (patch) | |
tree | 52f36d7e26ef8d27989489e60b8588cc3ae9b4a9 /meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | |
parent | ac01686d919addab17e5a9d60cc532e82943cd9b (diff) | |
download | poky-ffa5a1bda6741f5dc9f1b8db1bb37b0c6f103c99.tar.gz |
asciidoc: specify XML catalogue to use
libxml-native by default uses a XML catalogue at /etc/xml/catalog, instead of
the one in the sysroot. Until this is fixed (#13260) override the XML catalogue
manually in the recipe to point explicitly at the docbook-xml and docbook-xsl
catalogues.
This fixes either complete build failures (where the host doesn't have
docbook-xml installed) or slow builds (where the host doesn't have docbook-xsl
installed).
(From OE-Core rev: efb6168e41797ad6ed00ede6f3d9141b90eff4b5)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb')
-rw-r--r-- | meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb index d0d15171ac..f684f12dc7 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | |||
@@ -8,14 +8,19 @@ LICENSE = "GPLv2" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ |
9 | file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069" | 9 | file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https" | 11 | SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \ |
12 | file://auto-catalogs.patch" | ||
12 | SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0" | 13 | SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0" |
13 | PV .= "+py3-git${SRCPV}" | 14 | PV .= "+py3-git${SRCPV}" |
14 | 15 | ||
15 | DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native" | 16 | DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" |
16 | 17 | ||
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
18 | 19 | ||
20 | # Tell xmllint where to find the DocBook XML catalogue, because right now it | ||
21 | # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch | ||
22 | export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xml.xml file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xsl.xml" | ||
23 | |||
19 | # Not using automake | 24 | # Not using automake |
20 | inherit autotools-brokensep | 25 | inherit autotools-brokensep |
21 | CLEANBROKEN = "1" | 26 | CLEANBROKEN = "1" |