diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2021-10-20 02:15:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 09:15:14 +0200 |
| commit | 42a6e1fcee81aa31a58023d6b44c1a8b01e73500 (patch) | |
| tree | ba9e413217e2879e5dbb0f0b5f6c69a14316a440 /var | |
| parent | 1983d6d9d0a63aa874e3546e671f0bfea3390300 (diff) | |
| download | spack-42a6e1fcee81aa31a58023d6b44c1a8b01e73500.tar.gz spack-42a6e1fcee81aa31a58023d6b44c1a8b01e73500.tar.bz2 spack-42a6e1fcee81aa31a58023d6b44c1a8b01e73500.tar.xz spack-42a6e1fcee81aa31a58023d6b44c1a8b01e73500.zip | |
root: prepend dependent_spec.prefix.include to ROOT_INCLUDE_PATH (#26379)
Spack is not populating CPATH anymore (https://github.com/spack/spack/commit/e3f97b37e64d4de70baf8e58fcd747b021d8f2f9#diff-259adc895c0b2e8fca42ffb99d8051eec0712c868d12d8da255d32f1663acdc7), and downstream packages ([gaudi](https://github.com/spack/spack/blob/1aa7758dbb572aa0f92efe1e1f61b2df37aae2e5/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.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gaudi/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index a7d37c8651..b23e7bc493 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -113,7 +113,6 @@ class Gaudi(CMakePackage): # 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]) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index ad99453d28..b02ad3131d 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -617,6 +617,7 @@ class Root(CMakePackage): 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 @@ class Root(CMakePackage): 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) |