hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing libiconv dependency to libxml2 (#10148)

Browse source
This commit is contained in:
Adam J. Stewart 2018-12-19 11:38:14 -06:00 committed by GitHub
parent 0fcca9f422
commit 654360d2ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
var/spack/repos/builtin/packages/libxml2/package.py
View file

@ -21,18 +21,24 @@ class Libxml2(AutotoolsPackage):
variant('python', default=False, description='Enable Python support') variant('python', default=False, description='Enable Python support')
extends('python', when='+python', depends_on('pkgconfig@0.9.0:', type='build')
ignore=r'(bin.*$)|(include.*$)|(share.*$)|(lib/libxml2.*$)|' depends_on('libiconv')
'(lib/xml2.*$)|(lib/cmake.*$)')
depends_on('zlib') depends_on('zlib')
depends_on('xz') depends_on('xz')
depends_on('pkgconfig', type='build') extends('python+shared', when='+python',
ignore=r'(bin.*$)|(include.*$)|(share.*$)|(lib/libxml2.*$)|'
'(lib/xml2.*$)|(lib/cmake.*$)')
# XML Conformance Test Suites
# See http://www.w3.org/XML/Test/ for information
resource(name='xmlts', url='http://www.w3.org/XML/Test/xmlts20080827.tar.gz',
sha256='96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7')
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
args = ["--with-lzma=%s" % spec['xz'].prefix] args = ['--with-lzma={0}'.format(spec['xz'].prefix)]
if '+python' in spec: if '+python' in spec:
args.extend([ args.extend([
@ -47,3 +53,10 @@ def configure_args(self):
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
spack_env.prepend_path('CPATH', self.prefix.include.libxml2) spack_env.prepend_path('CPATH', self.prefix.include.libxml2)
run_env.prepend_path('CPATH', self.prefix.include.libxml2) run_env.prepend_path('CPATH', self.prefix.include.libxml2)
@run_after('install')
@on_package_attributes(run_tests=True)
def import_module_test(self):
if '+python' in self.spec:
with working_dir('spack-test', create=True):
python('-c', 'import libxml2')