From 8ebe809d369039761d04d4c2a4bbcf8051e6b24e Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Fri, 27 Jan 2023 13:33:36 +0100
Subject: [PATCH] HDF5 has a FORTRAN api so must be at compiler level

---
 ...core-8.3.0-serial.eb => HDF5-1.10.5-GCC-8.3.0-serial.eb} | 6 +-----
 ...re-11.3.0-serial.eb => HDF5-1.12.2-GCC-11.3.0-serial.eb} | 6 +-----
 ...re-11.3.0-serial.eb => HDF5-1.13.1-GCC-11.3.0-serial.eb} | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)
 rename easybuild/easyconfigs/h/HDF5/{HDF5-1.10.5-GCCcore-8.3.0-serial.eb => HDF5-1.10.5-GCC-8.3.0-serial.eb} (87%)
 rename easybuild/easyconfigs/h/HDF5/{HDF5-1.12.2-GCCcore-11.3.0-serial.eb => HDF5-1.12.2-GCC-11.3.0-serial.eb} (87%)
 rename easybuild/easyconfigs/h/HDF5/{HDF5-1.13.1-GCCcore-11.3.0-serial.eb => HDF5-1.13.1-GCC-11.3.0-serial.eb} (87%)

diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.10.5-GCCcore-8.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.10.5-GCC-8.3.0-serial.eb
similarity index 87%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.10.5-GCCcore-8.3.0-serial.eb
rename to easybuild/easyconfigs/h/HDF5/HDF5-1.10.5-GCC-8.3.0-serial.eb
index 7bc2b35825e..9862e5f86f1 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.10.5-GCCcore-8.3.0-serial.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.10.5-GCC-8.3.0-serial.eb
@@ -7,17 +7,13 @@ description = """HDF5 is a data model, library, and file format for storing and
  It supports an unlimited variety of datatypes, and is designed for flexible
  and efficient I/O and for high volume and complex data."""
 
-toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
+toolchain = {'name': 'GCC', 'version': '8.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['6d4ce8bf902a97b050f6f491f4268634e252a63dadd6656a1a9be5b7b7726fa8']
 
-builddependencies = [
-    ('binutils', '2.32'),
-]
-
 dependencies = [
     ('zlib', '1.2.11'),
     ('Szip', '2.1.1'),
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.12.2-GCCcore-11.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.12.2-GCC-11.3.0-serial.eb
similarity index 87%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.12.2-GCCcore-11.3.0-serial.eb
rename to easybuild/easyconfigs/h/HDF5/HDF5-1.12.2-GCC-11.3.0-serial.eb
index 494b1335329..ce6efc4e6ba 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.12.2-GCCcore-11.3.0-serial.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.12.2-GCC-11.3.0-serial.eb
@@ -8,17 +8,13 @@ description = """HDF5 is a data model, library, and file format for storing and
  It supports an unlimited variety of datatypes, and is designed for flexible
  and efficient I/O and for high volume and complex data."""
 
-toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['2a89af03d56ce7502dcae18232c241281ad1773561ec00c0f0e8ee2463910f14']
 
-builddependencies = [
-    ('binutils', '2.38'),
-]
-
 dependencies = [
     ('zlib', '1.2.12'),
     ('Szip', '2.1.1'),
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.13.1-GCCcore-11.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.13.1-GCC-11.3.0-serial.eb
similarity index 87%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.13.1-GCCcore-11.3.0-serial.eb
rename to easybuild/easyconfigs/h/HDF5/HDF5-1.13.1-GCC-11.3.0-serial.eb
index b73831007eb..60a4e24dfdb 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.13.1-GCCcore-11.3.0-serial.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.13.1-GCC-11.3.0-serial.eb
@@ -7,17 +7,13 @@ description = """HDF5 is a data model, library, and file format for storing and
  It supports an unlimited variety of datatypes, and is designed for flexible
  and efficient I/O and for high volume and complex data."""
 
-toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['051655873105112f7aeccd5f59ab21f35f7f4907f06921ae61aaf1ef1c71fd53']
 
-builddependencies = [
-    ('binutils', '2.38'),
-]
-
 dependencies = [
     ('zlib', '1.2.12'),
     ('Szip', '2.1.1'),