Merge branch 'main' into 2023.06-a64fx-4.9.4-2023b-gromacs-and-co

Author: bedroge

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml

@@ -120,6 +120,18 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22523
         from-commit: 0044f08898e12cfd31177bfce0747ef2172226d1
+# from here on easyconfigs were originally built with EB 4.9.3
+# originally built with EB 4.9.3, PR 21436 was merged into develop before EB
+# 4.9.4 was released, but maybe it wasn't included in EB 4.9.4, to be on the safe
+# side we just use the commit, PR 3569 was targetting Sapphire Rapids, so likely
+# that is not needed here, however we keep it to stay in sync with what was used
+# for Sapphire Rapids
+  - LAMMPS-29Aug2024-foss-2023b-kokkos.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21436
+        from-commit: 9dc24e57880a8adb06ae10557c5315e66671a533
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3569
+        include-easyblocks-from-commit: 362b4679193612e04abe336fa041e2a34d183991
 # included for gracehopper on https://github.com/EESSI/software-layer/pull/993
   - SIONlib-1.7.7-GCCcore-13.2.0-tools.eb:
       options:

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-001-system.yml

@@ -2,3 +2,4 @@ easyconfigs:
   - Java-11.0.27.eb
   - Java-17.0.15.eb
   - Java-21.0.7.eb
+  - Trimmomatic-0.39-Java-11.eb

easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-001-system.yml

@@ -0,0 +1,7 @@
+easyconfigs:
+  # note: M4 is only listed here because it's a build dependency for GCCcore,
+  #       but it was still filtered out as dependency when GCCcore/13.3.0 and GCCcore/14.2.0 got built;
+  #       now Autotools/Automake/libtool/M4 are retained as (build) dependency because the newer versions
+  #       in EESSI 2025.06 compat layer can cause problems with some installations (like OpenMPI);
+  #       see also https://github.com/EESSI/software-layer-scripts/pull/74
+  - M4-1.4.19.eb