From 3f5ef9acbef5d3a8f11d15dd27d5b36fc6ff26aa Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 9 Nov 2023 15:48:54 +0100 Subject: [PATCH 1/4] don't filter Lua dependency --- configure_easybuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure_easybuild b/configure_easybuild index 7dca1ce682..c67b879cf3 100644 --- a/configure_easybuild +++ b/configure_easybuild @@ -25,8 +25,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,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,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 c558a45966cec53d86e4f5a7f5331451c2a19e04 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 18 Nov 2023 10:23:21 +0100 Subject: [PATCH 2/4] add gnuplot explicitly (dep for OpenFOAM), to trigger re-install after removing Lua from filtered dependencies in EasyBuild configuration --- eessi-2023.06-eb-4.8.0-2021b.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index 477ba6320c..9524dd01df 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -4,4 +4,5 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 options: from-pr: 18746 + - gnuplot-5.4.2-GCCcore-11.2.0.eb - OpenFOAM-v2112-foss-2021b.eb From 73097a32ea0956644adc209ba2097a69340f82e2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 18 Nov 2023 11:25:21 +0100 Subject: [PATCH 3/4] remove filter-deps for AOFlagger, since Lua is no longer filtered in general EasyBuild configuration --- eessi-2023.06-eb-4.8.2-2022a.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml index bab796db2b..9921bad045 100644 --- a/eessi-2023.06-eb-4.8.2-2022a.yml +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -5,27 +5,6 @@ easyconfigs: - AOFlagger-3.4.0-foss-2022a: options: from-pr: 19119 - # Exclude Lua from `filter-deps` as the compat layer version is too old for the software - filter-deps: - - Autoconf - - Automake - - Autotools - - binutils - - bzip2 - - DBus - - flex - - gettext - - gperf - - help2man - - intltool - - libreadline - - libtool - - ncurses - - M4 - - makeinfo - - util-linux - - XZ - - zlib - EveryBeam-0.5.2-foss-2022a: options: from-pr: 19119 From f1ab7f23fbc3bbfa0178c961d8b70248f60db3b3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 18 Nov 2023 12:19:18 +0100 Subject: [PATCH 4/4] install gnuplot via easyconfig PR that fixing linking error to Lua dependency --- eessi-2023.06-eb-4.8.0-2021b.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index 9524dd01df..a2562a4ed1 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -4,5 +4,9 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 options: from-pr: 18746 - - gnuplot-5.4.2-GCCcore-11.2.0.eb + - gnuplot-5.4.2-GCCcore-11.2.0.eb: + # make sure that Lua dependency is correctly picked up, + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19261 + options: + from-pr: 19261 - OpenFOAM-v2112-foss-2021b.eb