From cfe77fcd90bb3c26dd615112909de008633e1abc Mon Sep 17 00:00:00 2001 From: Derek Ryan Strong Date: Thu, 30 Nov 2023 16:18:02 -0800 Subject: r: add license and missing versions and fix rmath build directory (#41260) * Add R license and missing versions * Fix rmath build directory --- var/spack/repos/builtin/packages/r/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index a12d089808..25688f96f2 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -20,7 +20,12 @@ class R(AutotoolsPackage): extendable = True + license("GPL-2.0-or-later") + + version("4.3.2", sha256="b3f5760ac2eee8026a3f0eefcb25b47723d978038eee8e844762094c860c452a") + version("4.3.1", sha256="8dd0bf24f1023c6f618c3b317383d291b4a494f40d73b983ac22ffea99e4ba99") version("4.3.0", sha256="45dcc48b6cf27d361020f77fde1a39209e997b81402b3663ca1c010056a6a609") + version("4.2.3", sha256="55e4a9a6d43be314e2c03d0266a6fa5444afdce50b303bfc3b82b3979516e074") version("4.2.2", sha256="0ff62b42ec51afa5713caee7c4fde7a0c45940ba39bef8c5c9487fef0c953df5") version("4.2.1", sha256="4d52db486d27848e54613d4ee977ad952ec08ce17807e1b525b10cd4436c643f") version("4.2.0", sha256="38eab7719b7ad095388f06aa090c5a2b202791945de60d3e2bb0eab1f5097488") @@ -118,7 +123,7 @@ class R(AutotoolsPackage): @run_after("install") def install_rmath(self): if "+rmath" in self.spec: - with working_dir("src/nmath/standalone"): + with working_dir(join_path(self.build_directory, "src", "nmath", "standalone")): make() make("install", parallel=False) -- cgit v1.2.3-70-g09d2