From a8b217254160f8cb903eb0d454aecdbbabf4f672 Mon Sep 17 00:00:00 2001
From: Simon Pinches <Simon.Pinches@iter.org>
Date: Sat, 23 Nov 2024 17:39:27 +0100
Subject: [PATCH 1/2] adding easyconfigs: Fortran-stdlib-0.7.0-GCC-13.2.0.eb,
 Fortran-stdlib-0.7.0-intel-compilers-2023.2.1.eb, fypp-3.2-GCCcore-13.2.0.eb

---
 .../Fortran-stdlib-0.7.0-GCC-13.2.0.eb        | 29 ++++++++++++++++++
 ...n-stdlib-0.7.0-intel-compilers-2023.2.1.eb | 30 +++++++++++++++++++
 .../f/fypp/fypp-3.2-GCCcore-13.2.0.eb         | 22 ++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-GCC-13.2.0.eb
 create mode 100644 easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-intel-compilers-2023.2.1.eb
 create mode 100644 easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb

diff --git a/easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-GCC-13.2.0.eb b/easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-GCC-13.2.0.eb
new file mode 100644
index 00000000000..13a1094e0a9
--- /dev/null
+++ b/easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-GCC-13.2.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'CMakeNinja'
+
+name = 'Fortran-stdlib'
+version = '0.7.0'
+
+homepage = 'https://awvwgk.github.io/stdlib-docs/en/index.html'
+description = """Community driven and agreed upon de facto "standard" library for Fortran"""
+
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
+toolchainopts = {}  # toolchain options, e.g. opt, pic, usempi, optarch, ...
+
+source_urls = ['https://github.com/fortran-lang/stdlib/archive/refs/tags/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['07615b1fd0d9c78f04ec5a26234d091cb7e359933ba2caee311dcd6f58d87af0']
+
+builddependencies = [
+    ('CMake', '3.27.6'),
+    ('Ninja', '1.11.1'),
+    ('fypp', '3.2'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=on '
+
+sanity_check_paths = {
+    'files': ['include/fortran_stdlib/GNU-13.2.0/stdlib_version.mod', 'lib/libfortran_stdlib.%s' % SHLIB_EXT],
+    'dirs': ['include', 'lib', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-intel-compilers-2023.2.1.eb b/easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-intel-compilers-2023.2.1.eb
new file mode 100644
index 00000000000..b272e9de9cb
--- /dev/null
+++ b/easybuild/easyconfigs/f/Fortran-stdlib/Fortran-stdlib-0.7.0-intel-compilers-2023.2.1.eb
@@ -0,0 +1,30 @@
+easyblock = 'CMakeNinja'
+
+name = 'Fortran-stdlib'
+version = '0.7.0'
+
+homepage = 'https://awvwgk.github.io/stdlib-docs/en/index.html'
+description = """Community driven and agreed upon de facto "standard" library for Fortran"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2023.2.1'}
+toolchainopts = {}  # toolchain options, e.g. opt, pic, usempi, optarch, ...
+
+source_urls = ['https://github.com/fortran-lang/stdlib/archive/refs/tags/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['07615b1fd0d9c78f04ec5a26234d091cb7e359933ba2caee311dcd6f58d87af0']
+
+builddependencies = [
+    ('CMake', '3.27.6'),
+    ('Ninja', '1.11.1'),
+    ('fypp', '3.2'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=on '
+
+sanity_check_paths = {
+    'files': ['include/fortran_stdlib/Intel-2021.10.0.20230609/stdlib_version.mod',
+              'lib/libfortran_stdlib.%s' % SHLIB_EXT],
+    'dirs': ['include', 'lib', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb
new file mode 100644
index 00000000000..80c3f98a158
--- /dev/null
+++ b/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb
@@ -0,0 +1,22 @@
+easyblock = 'PythonPackage'
+
+name = 'fypp'
+version = '3.2'
+
+homepage = 'https://fypp.readthedocs.io/en/stable/index.html'
+description = """Fypp is a Python powered preprocessor primarily focused on Fortran."""
+
+toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['05c20f71dd9a7206ffe2d8688032723f97b8c2984d472ba045819d7d2b513bce']
+
+dependencies = [
+    ('Python', '3.11.5'),
+]
+
+use_pip = True
+download_dep_fail = True
+sanity_pip_check = True
+
+moduleclass = 'tools'

From 42ab76c31fe09c1553948bdedc8bbba400ec8002 Mon Sep 17 00:00:00 2001
From: Simon Pinches <Simon.Pinches@iter.org>
Date: Sat, 23 Nov 2024 18:13:44 +0100
Subject: [PATCH 2/2] fypp/3.2-GCCcore-13.2.0: Add binutils builddependency

---
 easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb
index 80c3f98a158..cb338ed0dcc 100644
--- a/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/f/fypp/fypp-3.2-GCCcore-13.2.0.eb
@@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['05c20f71dd9a7206ffe2d8688032723f97b8c2984d472ba045819d7d2b513bce']
 
-dependencies = [
-    ('Python', '3.11.5'),
-]
+builddependencies = [('binutils', '2.40')]
+dependencies = [('Python', '3.11.5')]
 
 use_pip = True
 download_dep_fail = True