From 18c36d51f4857466c123ac8f6a63ec98c843a078 Mon Sep 17 00:00:00 2001 From: lara Date: Mon, 25 Sep 2023 11:58:24 +0200 Subject: [PATCH 1/4] {2023.06}[foss/2021b] matplotlib v3.4.3 --- eessi-2023.06-eb-4.8.1-2021b.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.8.1-2021b.yml b/eessi-2023.06-eb-4.8.1-2021b.yml index 62f529563a..a1b9927e97 100644 --- a/eessi-2023.06-eb-4.8.1-2021b.yml +++ b/eessi-2023.06-eb-4.8.1-2021b.yml @@ -5,3 +5,4 @@ easyconfigs: options: from-pr: 18834 - R-4.2.0-foss-2021b.eb + - matplotlib-3.4.3-foss-2021b.eb From 73f7e42a10481b3a6279ccde227afa030726ae13 Mon Sep 17 00:00:00 2001 From: lara Date: Tue, 3 Oct 2023 11:00:43 +0200 Subject: [PATCH 2/4] add Pillow to easystack --- eessi-2023.06-eb-4.8.1-2021b.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eessi-2023.06-eb-4.8.1-2021b.yml b/eessi-2023.06-eb-4.8.1-2021b.yml index a1b9927e97..ec019ea879 100644 --- a/eessi-2023.06-eb-4.8.1-2021b.yml +++ b/eessi-2023.06-eb-4.8.1-2021b.yml @@ -5,4 +5,8 @@ easyconfigs: options: from-pr: 18834 - R-4.2.0-foss-2021b.eb + - Pillow-8.3.2-GCCcore-11.2.0.eb: + # avoid that hardcoded paths like /usr/include are used in build commands + options: + from-pr: 18881 - matplotlib-3.4.3-foss-2021b.eb From 8b457d4dfebeb78f9b1915cb66683ec174f2d638 Mon Sep 17 00:00:00 2001 From: lara Date: Tue, 31 Oct 2023 10:50:24 +0100 Subject: [PATCH 3/4] use framework fix and Pillow fix in easybuild v4.8.2 --- eessi-2023.06-eb-4.8.1-2021b.yml | 5 ----- eessi-2023.06-eb-4.8.2-2021b.yml | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 eessi-2023.06-eb-4.8.2-2021b.yml diff --git a/eessi-2023.06-eb-4.8.1-2021b.yml b/eessi-2023.06-eb-4.8.1-2021b.yml index ec019ea879..62f529563a 100644 --- a/eessi-2023.06-eb-4.8.1-2021b.yml +++ b/eessi-2023.06-eb-4.8.1-2021b.yml @@ -5,8 +5,3 @@ easyconfigs: options: from-pr: 18834 - R-4.2.0-foss-2021b.eb - - Pillow-8.3.2-GCCcore-11.2.0.eb: - # avoid that hardcoded paths like /usr/include are used in build commands - options: - from-pr: 18881 - - matplotlib-3.4.3-foss-2021b.eb diff --git a/eessi-2023.06-eb-4.8.2-2021b.yml b/eessi-2023.06-eb-4.8.2-2021b.yml new file mode 100644 index 0000000000..746f8df05f --- /dev/null +++ b/eessi-2023.06-eb-4.8.2-2021b.yml @@ -0,0 +1,2 @@ +easyconfigs: + - matplotlib-3.4.3-foss-2021b.eb From 7c679a03000d5542afde8cf1b34fa6db6335f1ec Mon Sep 17 00:00:00 2001 From: lara Date: Mon, 20 Nov 2023 11:22:24 +0100 Subject: [PATCH 4/4] Make Pillow sysroot aware --- eessi-2023.06-eb-4.8.2-2021b.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eessi-2023.06-eb-4.8.2-2021b.yml b/eessi-2023.06-eb-4.8.2-2021b.yml index 746f8df05f..00c02adf91 100644 --- a/eessi-2023.06-eb-4.8.2-2021b.yml +++ b/eessi-2023.06-eb-4.8.2-2021b.yml @@ -1,2 +1,6 @@ easyconfigs: + - Pillow-8.3.2-GCCcore-11.2.0.eb: + # avoid that hardcoded paths like /usr/include are used in build commands + options: + from-pr: 19226 - matplotlib-3.4.3-foss-2021b.eb