Skip to content

Commit

Permalink
bump version and commit, dont mask new gcc, unmask openssl 1.1.1w, re…
Browse files Browse the repository at this point in the history
…move gold from bintuils use flags
  • Loading branch information
bedroge committed Mar 8, 2024
1 parent be5af42 commit 6b4c9ad
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions ansible/playbooks/roles/compatibility_layer/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Defaults file for the compatibility layer role.
---
eessi_version: "2023.06"
eessi_version: "2024.03"

custom_overlays:
- name: eessi
Expand All @@ -16,27 +16,25 @@ gentoo_prefix_path: /cvmfs/{{ cvmfs_repository }}/versions/{{ eessi_version }}/c
gentoo_git_repo: https://github.com/gentoo/gentoo.git
# Select a specific commit in the gentoo_git_repo that should be used for the bootstrap,
# e.g. by checking: https://github.com/gentoo/gentoo/commits/master
# April 17 (29492845e41ea6a0a4a9769c7e0ce287d106079b) commit is after fix for Lmod
# gentoo_git_commit: 29492845e41ea6a0a4a9769c7e0ce287d106079b
# June 8 (aab8473aa90e0287553b3348a5c5b17872df4b7b) commit that was current when fetching luaposix
gentoo_git_commit: aab8473aa90e0287553b3348a5c5b17872df4b7b
# March 7: latest commit (includes a RISC-V fix for GCC)
gentoo_git_commit: 7e595dc3c3330522878452ea98906046c0d0f45b
prefix_required_space: 15 GB
prefix_user_defined_trusted_dirs:
- "/cvmfs/{{ cvmfs_repository }}/host_injections/{{ eessi_version }}/compat/{{ eessi_host_os }}/{{ eessi_host_arch }}/lib"
prefix_mask_packages: |
# stick to GCC 10.x; using a too recent compiler in the compat layer complicates stuff in the software layer,
# see for example https://github.com/EESSI/software-layer/issues/151
>=sys-devel/gcc-11
#>=sys-devel/gcc-11
# mask OpenSSL 3.x, stick to OpenSSL 1.1.x for now to avoid problems with:
# - older versions of Rust (see https://github.com/EESSI/software-layer/issues/257)
# - older versions of cryptograhy in Python (see https://github.com/EESSI/software-layer/issues/258)
>=dev-libs/openssl-3
prefix_unmask_packages: |
# unmask older GCC to make it installable
=sys-devel/gcc-9*
# unmask older OpenSSL to make it installable
=dev-libs/openssl-1.1.1w
prefix_bootstrap_use_flags: |
# make sure that gold linker is installed with binutils
sys-devel/binutils gold
# sys-devel/binutils gold
# only install Python 3.11
*/* PYTHON_TARGETS: -* python3_11
*/* PYTHON_SINGLE_TARGET: -* python3_11
Expand Down

0 comments on commit 6b4c9ad

Please sign in to comment.