zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asciidoc-py3 add docbook dependency and fix a enviroment variable problem for docbook-{xml,xsl} (#19547)

Browse Source 
* asciidoc-py3: add docbook-{xml,xsl} dependency

* docbook-{xsl,xml}: fix XML_CATALOG_FILES enviroment variable
This commit is contained in:
lorddavidiii 2020-10-28 02:11:37 +01:00 committed by GitHub
parent 79b0eab2af
commit 6a5d399f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/asciidoc-py3/package.py
View File

@ -23,3 +23,5 @@ class AsciidocPy3(AutotoolsPackage):
depends_on('python@3.5:', type=('build', 'run')) depends_on('python@3.5:', type=('build', 'run'))
depends_on('libxml2', type=('build', 'run')) depends_on('libxml2', type=('build', 'run'))
depends_on('libxslt', type=('build', 'run')) depends_on('libxslt', type=('build', 'run'))
depends_on('docbook-xml', type=('build', 'run'))
depends_on('docbook-xsl', type=('build', 'run'))

10
var/spack/repos/builtin/packages/docbook-xml/package.py
View File

@ -20,6 +20,14 @@ class DocbookXml(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
install_tree('.', prefix) install_tree('.', prefix)
@property
def catalog(self):
return os.path.join(self.prefix, 'catalog.xml')
def setup_run_environment(self, env): def setup_run_environment(self, env):
catalog = os.path.join(self.prefix, 'catalog.xml') catalog = self.catalog
env.set('XML_CATALOG_FILES', catalog, separator=' ') env.set('XML_CATALOG_FILES', catalog, separator=' ')
def setup_dependent_build_environment(self, env, dependent_spec):
catalog = self.catalog
env.set("XML_CATALOG_FILES", catalog, separator=' ')

4
var/spack/repos/builtin/packages/docbook-xsl/package.py
View File

@ -28,8 +28,8 @@ def catalog(self):
def setup_run_environment(self, env): def setup_run_environment(self, env):
catalog = self.catalog catalog = self.catalog
env.set('XML_CATALOG_FILES', catalog, separator=' ') env.prepend_path('XML_CATALOG_FILES', catalog, separator=' ')
def setup_dependent_build_environment(self, env, dependent_spec): def setup_dependent_build_environment(self, env, dependent_spec):
catalog = self.catalog catalog = self.catalog
env.prepend_path("XML_CATALOG_FILES", catalog) env.prepend_path("XML_CATALOG_FILES", catalog, separator=' ')