From 56de86dda64b904cc06ebfdc30ee572eee0abd51 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Wed, 13 Nov 2019 01:33:47 -0600 Subject: root: relax libxml2 requirements when ~python. (#13657) * Relax libxml2 requirements when ~python. Per https://github.com/spack/spack/issues/13637#issuecomment-552026561 * Satisfy package_sanity.py::test_prs_update_old_api. --- var/spack/repos/builtin/packages/root/package.py | 45 +++++++++++++----------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 7087572191..c2fd132e14 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -252,8 +252,7 @@ class Root(CMakePackage): depends_on('vc', when='+vc') depends_on('veccore', when='+veccore') depends_on('vdt', when='+vdt') - depends_on('libxml2+python', when='+xml+python') - depends_on('libxml2~python', when='+xml~python') + depends_on('libxml2', when='+xml') depends_on('xrootd', when='+xrootd') # depends_on('hdfs') - supported (TODO) @@ -507,23 +506,27 @@ class Root(CMakePackage): spec['python'].command.path) return options - def setup_environment(self, spack_env, run_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) + def setup_build_environment(self, env): if 'lz4' in self.spec: - spack_env.append_path('CMAKE_PREFIX_PATH', - self.spec['lz4'].prefix) - spack_env.set('SPACK_INCLUDE_DIRS', '', force=True) - - def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - spack_env.set('ROOTSYS', self.prefix) - spack_env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1))) - spack_env.prepend_path('PYTHONPATH', self.prefix.lib) - spack_env.prepend_path('PATH', self.prefix.bin) - spack_env.append_path('CMAKE_MODULE_PATH', '{0}/cmake' - .format(self.prefix)) - 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) - run_env.prepend_path('PATH', self.prefix.bin) + env.append_path('CMAKE_PREFIX_PATH', + self.spec['lz4'].prefix) + env.set('SPACK_INCLUDE_DIRS', '', force=True) + + def setup_run_environment(self, env): + env.set('ROOTSYS', self.prefix) + env.set('ROOT_VERSION', 'v{0}'.format(self.version.up_to(1))) + env.prepend_path('PYTHONPATH', self.prefix.lib) + + def setup_dependent_build_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) + 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) -- cgit v1.2.3-70-g09d2