From 9e2e17ea7084e8c54fc9df085aae0726419a1de4 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 3 Oct 2023 14:38:51 +0200 Subject: [PATCH 1/2] remove cURL from filter-deps --- configure_easybuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_easybuild b/configure_easybuild index 23f3920154..7dca1ce682 100644 --- a/configure_easybuild +++ b/configure_easybuild @@ -26,7 +26,7 @@ fi # note: filtering Bison may break some installations, like Qt5 (see https://github.com/EESSI/software-layer/issues/49) # filtering pkg-config breaks R-bundle-Bioconductor installation (see also https://github.com/easybuilders/easybuild-easyconfigs/pull/11104) # problems occur when filtering pkg-config with gnuplot too (picks up Lua 5.1 from $EPREFIX rather than from Lua 5.3 dependency) -DEPS_TO_FILTER=Autoconf,Automake,Autotools,binutils,bzip2,cURL,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib +DEPS_TO_FILTER=Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib # For aarch64 we need to also filter out Yasm. # See https://github.com/easybuilders/easybuild-easyconfigs/issues/11190 if [[ "$EESSI_CPU_FAMILY" == "aarch64" ]]; then From e9962edfffcd7e3e14fe838308af6510cc86d19f Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 3 Oct 2023 14:42:33 +0200 Subject: [PATCH 2/2] add ec files for git --- eessi-2023.06-eb-4.7.2-2021a.yml | 1 + eessi-2023.06-eb-4.7.2-2021b.yml | 1 + eessi-2023.06-eb-4.7.2-2022a.yml | 1 + eessi-2023.06-eb-4.7.2-2022b.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 8d4f37b22b..b7c703369b 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -3,6 +3,7 @@ easyconfigs: # - OpenSSL-1.1.eb: # options: # include-easyblocks-from-pr: 2922 + - git-2.32.0-GCCcore-10.3.0-nodocs.eb - GCC-10.3.0 - CMake-3.20.1-GCCcore-10.3.0.eb # - CMake-3.20.1-GCCcore-10.3.0.eb: diff --git a/eessi-2023.06-eb-4.7.2-2021b.yml b/eessi-2023.06-eb-4.7.2-2021b.yml index d6e2fb67ba..45776823ea 100644 --- a/eessi-2023.06-eb-4.7.2-2021b.yml +++ b/eessi-2023.06-eb-4.7.2-2021b.yml @@ -1,5 +1,6 @@ easyconfigs: - GCC-11.2.0 + - git-2.33.1-GCCcore-11.2.0-nodocs.eb - CMake-3.21.1-GCCcore-11.2.0.eb # - CMake-3.21.1-GCCcore-11.2.0.eb: # options: diff --git a/eessi-2023.06-eb-4.7.2-2022a.yml b/eessi-2023.06-eb-4.7.2-2022a.yml index 786f873999..9991de1508 100644 --- a/eessi-2023.06-eb-4.7.2-2022a.yml +++ b/eessi-2023.06-eb-4.7.2-2022a.yml @@ -1,5 +1,6 @@ easyconfigs: - GCC-11.3.0 + - git-2.36.0-GCCcore-11.3.0-nodocs.eb - CMake-3.23.1-GCCcore-11.3.0.eb # - CMake-3.23.1-GCCcore-11.3.0.eb: # options: diff --git a/eessi-2023.06-eb-4.7.2-2022b.yml b/eessi-2023.06-eb-4.7.2-2022b.yml index d691317ede..129b709b1c 100644 --- a/eessi-2023.06-eb-4.7.2-2022b.yml +++ b/eessi-2023.06-eb-4.7.2-2022b.yml @@ -1,5 +1,6 @@ easyconfigs: - GCC-12.2.0 + - git-2.38.1-GCCcore-12.2.0-nodocs.eb - CMake-3.24.3-GCCcore-12.2.0.eb # - CMake-3.24.3-GCCcore-12.2.0.eb: # options: