diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-11-08 14:58:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-08 14:58:33 +0100 |
| commit | a079722b1cc95c1b857f14d549c5ab8157cbb3b9 (patch) | |
| tree | 3e661c7516c9996463c6638a308d9937f580dffa /var | |
| parent | f332ac6d21e024d5540cbfd97fa35da3aef4111c (diff) | |
| download | spack-a079722b1cc95c1b857f14d549c5ab8157cbb3b9.tar.gz spack-a079722b1cc95c1b857f14d549c5ab8157cbb3b9.tar.bz2 spack-a079722b1cc95c1b857f14d549c5ab8157cbb3b9.tar.xz spack-a079722b1cc95c1b857f14d549c5ab8157cbb3b9.zip | |
r: fix order of execution for Makeconf filtering (#33752)
fixes #33747
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/r/package.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index b165645524..7aa60e37ba 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -107,8 +107,6 @@ class R(AutotoolsPackage): url = "https://cloud.r-project.org/src/base" return url + "/R-%s/R-%s.tar.gz" % (version.up_to(1), version) - filter_compiler_wrappers("Makeconf", relative_root=os.path.join("rlib", "R", "etc")) - @property def etcdir(self): return join_path(prefix, "rlib", "R", "etc") @@ -187,6 +185,9 @@ class R(AutotoolsPackage): dst_makeconf = join_path(self.etcdir, "Makeconf.spack") install(src_makeconf, dst_makeconf) + # To respect order of execution, we should filter after we made the copy above + filter_compiler_wrappers("Makeconf", relative_root=os.path.join("rlib", "R", "etc")) + # ======================================================================== # Set up environment to make install easy for R extensions. # ======================================================================== |