Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{2023.06} don't filter Lua dependency (and reinstall gnuplot/5.4.2-GCCcore-11.2.0) #380

Merged
merged 4 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions configure_easybuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions eessi-2023.06-eb-4.8.0-2021b.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +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:
# 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
21 changes: 0 additions & 21 deletions eessi-2023.06-eb-4.8.2-2022a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down