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

root: prepend dependent_spec.prefix.include to ROOT_INCLUDE_PATH (#26379)

Browse source 
Spack is not populating CPATH anymore (e3f97b37e6 (diff-259adc895c0b2e8fca42ffb99d8051eec0712c868d12d8da255d32f1663acdc7)), and downstream packages ([gaudi](1aa7758dbb/var/spack/repos/builtin/packages/gaudi/package.py (L116))) have alrady started to include this in their package.py files. Instead of propagating this to all downstream packages, it tries to address the issue at the source.
This commit is contained in:
Wouter Deconinck 2021-10-20 02:15:14 -05:00 committed by GitHub
parent 1983d6d9d0
commit 42a6e1fcee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
var/spack/repos/builtin/packages/gaudi/package.py
View file

@ -113,7 +113,6 @@ def setup_run_environment(self, env):
# environment as in Gaudi.xenv
env.prepend_path('PATH', self.prefix.scripts)
env.prepend_path('PYTHONPATH', self.prefix.python)
env.prepend_path('ROOT_INCLUDE_PATH', self.prefix.include)
def url_for_version(self, version):
major = str(version[0])

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

@ -617,6 +617,7 @@ def setup_dependent_build_environment(self, env, dependent_spec):
env.prepend_path('PYTHONPATH', self.prefix.lib)
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)
@ -625,5 +626,6 @@ def setup_dependent_run_environment(self, env, dependent_spec):
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.prepend_path('ROOT_INCLUDE_PATH', dependent_spec.prefix.include)
if "+rpath" not in self.spec:
env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib)