From 3b4869df32ab7b3e12e6fadc8df1b4e1fe413b37 Mon Sep 17 00:00:00 2001 From: RensDofferhoff <20978635+RensDofferhoff@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:34:00 +0100 Subject: [PATCH 1/2] always install matrix when installing jaspBase (#5326) --- Modules/install-jaspBase.R.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/install-jaspBase.R.in b/Modules/install-jaspBase.R.in index 79f5780c4a..8c8ef5154d 100644 --- a/Modules/install-jaspBase.R.in +++ b/Modules/install-jaspBase.R.in @@ -47,15 +47,15 @@ if (md5SumsChanged(modulePkg, moduleLibrary)) { } +#This is necessary because of conflicts with Matrix dep of base R lib. +#Can be removed when a new version of R updates its Matrix +if (!@IS_FLATPAK_USED@) { + renv::install("Matrix", library = moduleLibrary, prompt = prompt) +} + # Converting the absolute symlinks to relative symlinks on macOS # Todo, I can do this using CMake like I do on Windows if (Sys.info()["sysname"] == "Darwin") { source('@MODULES_BINARY_PATH@/symlinkTools.R') convertAbsoluteSymlinksToRelative('@R_LIBRARY_PATH@', '@MODULES_RENV_CACHE_PATH@') } - -#This is necessary because of conflicts with Matrix dep of base R lib. -#Can be removed when a new version of R updates its Matrix -if (@IS_LINUX_LOCAL_BUILD@) { - renv::install("Matrix", type="source") -} From dd98ecb9f7506540e2bca037cff646e7bcf87acc Mon Sep 17 00:00:00 2001 From: Joris Goosen Date: Thu, 23 Nov 2023 18:04:15 +0100 Subject: [PATCH 2/2] install Matix from source on macos, requires gfortran to be installed on the local system --- Modules/install-jaspBase.R.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Modules/install-jaspBase.R.in b/Modules/install-jaspBase.R.in index 8c8ef5154d..6eeee30924 100644 --- a/Modules/install-jaspBase.R.in +++ b/Modules/install-jaspBase.R.in @@ -50,7 +50,12 @@ if (md5SumsChanged(modulePkg, moduleLibrary)) { #This is necessary because of conflicts with Matrix dep of base R lib. #Can be removed when a new version of R updates its Matrix if (!@IS_FLATPAK_USED@) { - renv::install("Matrix", library = moduleLibrary, prompt = prompt) + + if (Sys.info()["sysname"] == "Darwin") { + options(pkgType = "source") + } + + renv::install("Matrix", library = moduleLibrary, prompt = prompt) } # Converting the absolute symlinks to relative symlinks on macOS