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

root: relax libxml2 requirements when ~python. (#13657)

Browse source 
* Relax libxml2 requirements when ~python.

Per https://github.com/spack/spack/issues/13637#issuecomment-552026561

* Satisfy package_sanity.py::test_prs_update_old_api.
This commit is contained in:
Chris Green 2019-11-13 01:33:47 -06:00 committed by Axel Huebl
parent 53b2add34f
commit 56de86dda6
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
var/spack/repos/builtin/packages/root/package.py
View file

@ -252,8 +252,7 @@ class Root(CMakePackage):
depends_on('vc', when='+vc') depends_on('vc', when='+vc')
depends_on('veccore', when='+veccore') depends_on('veccore', when='+veccore')
depends_on('vdt', when='+vdt') depends_on('vdt', when='+vdt')
depends_on('libxml2+python', when='+xml+python') depends_on('libxml2', when='+xml')
depends_on('libxml2~python', when='+xml~python')
depends_on('xrootd', when='+xrootd') depends_on('xrootd', when='+xrootd')
# depends_on('hdfs') - supported (TODO) # depends_on('hdfs') - supported (TODO)
@ -507,23 +506,27 @@ def cmake_args(self):
spec['python'].command.path) spec['python'].command.path)
return options return options
def setup_environment(self, spack_env, run_env): def setup_build_environment(self, env):
run_env.set('ROOTSYS', self.prefix)
run_env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1)))
run_env.prepend_path('PYTHONPATH', self.prefix.lib)
if 'lz4' in self.spec: if 'lz4' in self.spec:
spack_env.append_path('CMAKE_PREFIX_PATH', env.append_path('CMAKE_PREFIX_PATH',
self.spec['lz4'].prefix) self.spec['lz4'].prefix)
spack_env.set('SPACK_INCLUDE_DIRS', '', force=True) env.set('SPACK_INCLUDE_DIRS', '', force=True)
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_run_environment(self, env):
spack_env.set('ROOTSYS', self.prefix) env.set('ROOTSYS', self.prefix)
spack_env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1))) env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1)))
spack_env.prepend_path('PYTHONPATH', self.prefix.lib) env.prepend_path('PYTHONPATH', self.prefix.lib)
spack_env.prepend_path('PATH', self.prefix.bin)
spack_env.append_path('CMAKE_MODULE_PATH', '{0}/cmake' def setup_dependent_build_environment(self, env, dependent_spec):
.format(self.prefix)) env.set('ROOTSYS', self.prefix)
run_env.set('ROOTSYS', self.prefix) env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1)))
run_env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1))) env.prepend_path('PYTHONPATH', self.prefix.lib)
run_env.prepend_path('PYTHONPATH', self.prefix.lib) env.prepend_path('PATH', self.prefix.bin)
run_env.prepend_path('PATH', self.prefix.bin) env.append_path('CMAKE_MODULE_PATH', '{0}/cmake'
.format(self.prefix))
def setup_dependent_run_environment(self, env, dependent_spec):
env.set('ROOTSYS', self.prefix)
env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1)))
env.prepend_path('PYTHONPATH', self.prefix.lib)
env.prepend_path('PATH', self.prefix.bin)