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:21 +0100 |
commit | efb6168e41797ad6ed00ede6f3d9141b90eff4b5 (patch) | |
tree | 069cf26a0c286b1b68e110abe4dfe0de6cc97991 /meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | |
parent | 2f3adb21cc5067458a12964d0bde235966a20a60 (diff) | |
download | openembedded-core-contrib-efb6168e41797ad6ed00ede6f3d9141b90eff4b5.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).
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" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069" -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https" +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \ + file://auto-catalogs.patch" SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0" PV .= "+py3-git${SRCPV}" -DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native" +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" S = "${WORKDIR}/git" +# Tell xmllint where to find the DocBook XML catalogue, because right now it +# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xml.xml file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xsl.xml" + # Not using automake inherit autotools-brokensep CLEANBROKEN = "1" |