From 363f42c9bdaa905c0c094f69479b62520ae3a1e0 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Sun, 17 Dec 2023 10:53:00 +0100 Subject: [PATCH 1/5] {2023.06}[foss/2023a] R-bundle-CRAN 2023.12 --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml index a9323d3df6..f6d01ee828 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml @@ -32,3 +32,6 @@ easyconfigs: - R-4.3.2-gfbf-2023a.eb: options: from-pr: 19185 + - R-bundle-CRAN-2023.12-foss-2023a.eb: + options: + from-pr: 19170 From 69fe0569451b708ce13ba506854d44f383b213f2 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Sun, 17 Dec 2023 18:12:04 +0100 Subject: [PATCH 2/5] fix for LERC sanity check RPATH failure --- .../2023.06/eessi-2023.06-eb-4.8.2-2023a.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml index f6d01ee828..7371ee2176 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml @@ -32,6 +32,11 @@ easyconfigs: - R-4.3.2-gfbf-2023a.eb: options: from-pr: 19185 + - LERC-4.0.0-GCCcore-12.3.0.eb: + # avoid RPATH-related sanity check errors by compiling LERC's test binary in postinstallcmds; + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19386 + options: + from-pr: 19386 - R-bundle-CRAN-2023.12-foss-2023a.eb: options: from-pr: 19170 From 34b7e850bd8ece75a0d01fae5ddc62412701f945 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Mon, 18 Dec 2023 11:36:14 +0100 Subject: [PATCH 3/5] use patch for MPFR --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml index 7371ee2176..c5fb6a0425 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml @@ -32,6 +32,9 @@ easyconfigs: - R-4.3.2-gfbf-2023a.eb: options: from-pr: 19185 + - MPFR-4.2.0-GCCcore-12.3.0.eb: + options: + from-pr: 19438 - LERC-4.0.0-GCCcore-12.3.0.eb: # avoid RPATH-related sanity check errors by compiling LERC's test binary in postinstallcmds; # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19386 From 7283d086780b7dc9ae224a70bb4f6236a52e94d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 4 Apr 2024 22:52:41 +0200 Subject: [PATCH 4/5] add from-pr 20238 for R-bundle-CRAN --- .../2023.06/eessi-2023.06-eb-4.9.0-2023a.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml index 1674bd76d9..a7cabc110a 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml @@ -55,4 +55,6 @@ easyconfigs: - OpenJPEG-2.5.0-GCCcore-12.3.0.eb - OpenFOAM-10-foss-2023a.eb - Highway-1.0.4-GCCcore-12.3.0.eb - - R-bundle-CRAN-2023.12-foss-2023a.eb + - R-bundle-CRAN-2023.12-foss-2023a.eb: + options: + from-pr: 20238 From f6012f7ae91bfdf862f46e93cf6942067c8b580d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 5 Apr 2024 11:42:40 +0200 Subject: [PATCH 5/5] add comment, retrigger CI --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml index 7ab9cf7c9b..44952e2765 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml @@ -69,4 +69,5 @@ easyconfigs: from-pr: 20142 - R-bundle-CRAN-2023.12-foss-2023a.eb: options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20238 from-pr: 20238