summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-09-10 09:04:09 +0200
committerGitHub <noreply@github.com>2024-09-10 09:04:09 +0200
commit0905edf592752742eb4ddab3a528d3aee8f92930 (patch)
treef68a7e7c34bdbd5185fa18874540a3397da902aa
parent16dba7828864d683219c15df5028312601aea8b1 (diff)
downloadspack-0905edf592752742eb4ddab3a528d3aee8f92930.tar.gz
spack-0905edf592752742eb4ddab3a528d3aee8f92930.tar.bz2
spack-0905edf592752742eb4ddab3a528d3aee8f92930.tar.xz
spack-0905edf592752742eb4ddab3a528d3aee8f92930.zip
r: do not create dir in setup_dependent_package (#46282)
-rw-r--r--lib/spack/spack/build_systems/r.py24
-rw-r--r--var/spack/repos/builtin/packages/r/package.py5
2 files changed, 10 insertions, 19 deletions
diff --git a/lib/spack/spack/build_systems/r.py b/lib/spack/spack/build_systems/r.py
index 9950d67048..07bdb3d0ae 100644
--- a/lib/spack/spack/build_systems/r.py
+++ b/lib/spack/spack/build_systems/r.py
@@ -5,6 +5,7 @@
from typing import Optional, Tuple
import llnl.util.lang as lang
+from llnl.util.filesystem import mkdirp
from spack.directives import extends
@@ -36,6 +37,7 @@ class RBuilder(GenericBuilder):
def install(self, pkg, spec, prefix):
"""Installs an R package."""
+ mkdirp(pkg.module.r_lib_dir)
config_args = self.configure_args()
config_vars = self.configure_vars()
@@ -43,12 +45,12 @@ class RBuilder(GenericBuilder):
args = ["--vanilla", "CMD", "INSTALL"]
if config_args:
- args.append("--configure-args={0}".format(" ".join(config_args)))
+ args.append(f"--configure-args={' '.join(config_args)}")
if config_vars:
- args.append("--configure-vars={0}".format(" ".join(config_vars)))
+ args.append(f"--configure-vars={' '.join(config_vars)}")
- args.extend(["--library={0}".format(self.pkg.module.r_lib_dir), self.stage.source_path])
+ args.extend([f"--library={pkg.module.r_lib_dir}", self.stage.source_path])
pkg.module.R(*args)
@@ -79,27 +81,21 @@ class RPackage(Package):
@lang.classproperty
def homepage(cls):
if cls.cran:
- return "https://cloud.r-project.org/package=" + cls.cran
+ return f"https://cloud.r-project.org/package={cls.cran}"
elif cls.bioc:
- return "https://bioconductor.org/packages/" + cls.bioc
+ return f"https://bioconductor.org/packages/{cls.bioc}"
@lang.classproperty
def url(cls):
if cls.cran:
- return (
- "https://cloud.r-project.org/src/contrib/"
- + cls.cran
- + "_"
- + str(list(cls.versions)[0])
- + ".tar.gz"
- )
+ return f"https://cloud.r-project.org/src/contrib/{cls.cran}_{str(list(cls.versions)[0])}.tar.gz"
@lang.classproperty
def list_url(cls):
if cls.cran:
- return "https://cloud.r-project.org/src/contrib/Archive/" + cls.cran + "/"
+ return f"https://cloud.r-project.org/src/contrib/Archive/{cls.cran}/"
@property
def git(self):
if self.bioc:
- return "https://git.bioconductor.org/packages/" + self.bioc
+ return f"https://git.bioconductor.org/packages/{self.bioc}"
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py
index a2d0f01517..478d4c5d8b 100644
--- a/var/spack/repos/builtin/packages/r/package.py
+++ b/var/spack/repos/builtin/packages/r/package.py
@@ -297,8 +297,3 @@ class R(AutotoolsPackage):
# Add variable for library directry
module.r_lib_dir = join_path(dependent_spec.prefix, self.r_lib_dir)
-
- # Make the site packages directory for extensions, if it does not exist
- # already.
- if dependent_spec.package.is_extension:
- mkdirp(module.r_lib_dir)