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

r: fix order of execution for Makeconf filtering (#33752)

Browse Source 
fixes #33747
This commit is contained in:
Massimiliano Culpo 2022-11-08 14:58:33 +01:00 committed by GitHub
parent f332ac6d21
commit a079722b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/r/package.py
View File

@ -107,8 +107,6 @@ def url_for_version(self, version):
url = "https://cloud.r-project.org/src/base" url = "https://cloud.r-project.org/src/base"
return url + "/R-%s/R-%s.tar.gz" % (version.up_to(1), version) 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 @property
def etcdir(self): def etcdir(self):
return join_path(prefix, "rlib", "R", "etc") return join_path(prefix, "rlib", "R", "etc")
@ -187,6 +185,9 @@ def copy_makeconf(self):
dst_makeconf = join_path(self.etcdir, "Makeconf.spack") dst_makeconf = join_path(self.etcdir, "Makeconf.spack")
install(src_makeconf, dst_makeconf) 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. # Set up environment to make install easy for R extensions.
# ======================================================================== # ========================================================================