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

root does not actually install libraries in /lib but in /lib/root (#31624)

Browse Source
This commit is contained in:
Hadrien G 2022-07-21 09:33:52 +02:00 committed by GitHub
parent 15d50d81db
commit aa68f23177
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/root/package.py
View File

@ -631,23 +631,23 @@ def add_include_path(dep_name):
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)
env.prepend_path('PYTHONPATH', self.prefix.lib.root)
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('PYTHONPATH', self.prefix.lib.root)
env.prepend_path('PATH', self.prefix.bin)
env.append_path('CMAKE_MODULE_PATH', self.prefix.cmake)
env.prepend_path('ROOT_INCLUDE_PATH', dependent_spec.prefix.include)
if "+rpath" not in self.spec:
env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib)
env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib.root)
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('PYTHONPATH', self.prefix.lib.root)
env.prepend_path('PATH', self.prefix.bin)
env.prepend_path('ROOT_INCLUDE_PATH', dependent_spec.prefix.include)
if "+rpath" not in self.spec:
env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib)
env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib.root)