From 08aeb804ce6be80a5c874ca84da6c61f34144cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Thu, 10 Oct 2024 18:10:55 +0200
Subject: [PATCH 1/3] Fix flags for updated mesonninja easyblock

---
 easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.2.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.3.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-9.3.0.eb         | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-11.3.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.2.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.3.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.2.0.eb        | 2 +-
 easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.3.0.eb        | 2 +-
 easybuild/easyconfigs/f/freebayes/freebayes-1.3.5-GCC-10.2.0.eb | 2 --
 .../f/freebayes/freebayes-1.3.6-foss-2021a-R-4.1.0.eb           | 2 --
 .../f/freebayes/freebayes-1.3.6-foss-2021b-R-4.1.2.eb           | 2 --
 .../f/freebayes/freebayes-1.3.7-gfbf-2023a-R-4.3.2.eb           | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.64.1-GCCcore-9.3.0.eb       | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.66.1-GCCcore-10.2.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.68.2-GCCcore-10.3.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.72.1-GCCcore-11.3.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.75.0-GCCcore-12.2.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.77.1-GCCcore-12.3.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.78.1-GCCcore-13.2.0.eb      | 2 +-
 easybuild/easyconfigs/g/GLib/GLib-2.80.4-GCCcore-13.3.0.eb      | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-10.2.0.eb            | 2 +-
 .../easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-9.3.0.eb | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.2.0.eb           | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.3.0.eb           | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-13.2.0.eb           | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.11-GCCcore-13.3.0.eb           | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-10.3.0.eb            | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb            | 2 +-
 .../g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.8-GCCcore-11.3.0.eb            | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.44.7-GCCcore-9.3.0.eb     | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.47.0-GCCcore-10.2.0.eb    | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.48.5-GCCcore-10.3.0.eb    | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb    | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.50.12-GCCcore-12.2.0.eb   | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.50.14-GCCcore-12.3.0.eb   | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.50.7-GCCcore-11.3.0.eb    | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.51.0-GCCcore-13.2.0.eb    | 2 +-
 easybuild/easyconfigs/p/Pango/Pango-1.54.0-GCCcore-13.3.0.eb    | 2 +-
 .../easyconfigs/p/PretextMap/PretextMap-0.1.9-GCCcore-12.3.0.eb | 2 +-
 .../easyconfigs/w/Wayland/Wayland-1.20.0-GCCcore-11.3.0.eb      | 1 +
 .../easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.2.0.eb      | 1 +
 .../easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.3.0.eb      | 1 +
 .../easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.2.0.eb      | 1 +
 .../easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.3.0.eb      | 1 +
 .../easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-13.2.0.eb      | 1 +
 .../easyconfigs/w/Wayland/Wayland-1.23.0-GCCcore-13.3.0.eb      | 1 +
 easybuild/easyconfigs/x/xtb/xtb-6.4.1-foss-2021b.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.4.1-intel-2021a.eb            | 2 +-
 easybuild/easyconfigs/x/xtb/xtb-6.5.0-foss-2021b.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.5.1-foss-2022a.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.6.0-foss-2022a.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.6.0-intel-2022a.eb            | 2 --
 easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2022b.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2023a.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.7.0-gfbf-2023a.eb             | 1 -
 easybuild/easyconfigs/x/xtb/xtb-6.7.1-gfbf-2023b.eb             | 1 -
 58 files changed, 46 insertions(+), 55 deletions(-)

diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.2.0.eb
index 91ba9a2e476..eb70f8215ec 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.2.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.2.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.66.1'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.3.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.3.0.eb
index cf41c4d87a5..bace7ca0950 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.3.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-10.3.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.68.2'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb
index f387195260d..e348300152e 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.69.1'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-9.3.0.eb
index eb60b8b7261..c7864524a5e 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-9.3.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.36.0-GCCcore-9.3.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.64.1'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-11.3.0.eb
index 3c2987a1b4a..351b10a92ab 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-11.3.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.72.1'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.2.0.eb
index 38922c40f8d..b890b5d2f39 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.2.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.75.0'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.3.0.eb
index e975d98ac9c..7f3ac7c5736 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-12.3.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.77.1'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.2.0.eb
index 6093e7836d8..e9a45047123 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.2.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.78.1'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.3.0.eb
index 506079ce98c..8cef10f6242 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.38.0-GCCcore-13.3.0.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.80.4'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dintrospection=true "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.5-GCC-10.2.0.eb b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.5-GCC-10.2.0.eb
index f57fb4074be..6cdb2634cff 100644
--- a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.5-GCC-10.2.0.eb
+++ b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.5-GCC-10.2.0.eb
@@ -45,8 +45,6 @@ preconfigopts += 'CPPFLAGS="-I${EBROOTMULTICHOOSE}/include/multichoose ${CPPFLAG
 # add missing linker flags for fastahack and smithwaterman
 preconfigopts += 'LDFLAGS="-lsw -lfastahack ${LDFLAGS}"'
 
-configopts = "--buildtype release"
-
 postinstallcmds = [
     # add extra scripts
     "cp -r %(builddir)s/%(name)s-%(version)s/scripts %(installdir)s/",
diff --git a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021a-R-4.1.0.eb b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021a-R-4.1.0.eb
index cc4ea323667..d35312f2e15 100644
--- a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021a-R-4.1.0.eb
+++ b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021a-R-4.1.0.eb
@@ -40,8 +40,6 @@ dependencies = [
     ('SeqLib', '1.2.0'),
 ]
 
-configopts = "--buildtype release"
-
 sanity_check_paths = {
     'files': ['bin/freebayes', 'bin/bamleftalign', 'scripts/freebayes-parallel'],
     'dirs': [],
diff --git a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021b-R-4.1.2.eb b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021b-R-4.1.2.eb
index 0751b860c54..c29c8f651ff 100644
--- a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021b-R-4.1.2.eb
+++ b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.6-foss-2021b-R-4.1.2.eb
@@ -40,8 +40,6 @@ dependencies = [
     ('SeqLib', '1.2.0'),
 ]
 
-configopts = "--buildtype release"
-
 sanity_check_paths = {
     'files': ['bin/freebayes', 'bin/bamleftalign', 'scripts/freebayes-parallel'],
     'dirs': [],
diff --git a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.7-gfbf-2023a-R-4.3.2.eb b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.7-gfbf-2023a-R-4.3.2.eb
index 9c7ff736b2e..1a998a32ed3 100644
--- a/easybuild/easyconfigs/f/freebayes/freebayes-1.3.7-gfbf-2023a-R-4.3.2.eb
+++ b/easybuild/easyconfigs/f/freebayes/freebayes-1.3.7-gfbf-2023a-R-4.3.2.eb
@@ -40,7 +40,7 @@ dependencies = [
     ('SeqLib', '1.2.0'),
 ]
 
-configopts = "-Dprefer_system_deps=true --buildtype release"
+configopts = "-Dprefer_system_deps=true"
 
 sanity_check_paths = {
     'files': ['bin/freebayes', 'bin/bamleftalign', 'scripts/freebayes-parallel'],
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.64.1-GCCcore-9.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.64.1-GCCcore-9.3.0.eb
index 91e6b9d3b37..809eb95c23c 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.64.1-GCCcore-9.3.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.64.1-GCCcore-9.3.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.66.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.66.1-GCCcore-10.2.0.eb
index f45c527ed46..70f37bb9e83 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.66.1-GCCcore-10.2.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.66.1-GCCcore-10.2.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.68.2-GCCcore-10.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.68.2-GCCcore-10.3.0.eb
index 4846b0e2477..e075daac9d4 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.68.2-GCCcore-10.3.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.68.2-GCCcore-10.3.0.eb
@@ -44,7 +44,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
index c9f6dab66c4..0d629c28453 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.72.1-GCCcore-11.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.72.1-GCCcore-11.3.0.eb
index e6aea6b5a56..e0045bbaca4 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.72.1-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.72.1-GCCcore-11.3.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.75.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.75.0-GCCcore-12.2.0.eb
index 0390a9a2e54..173c69dee1f 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.75.0-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.75.0-GCCcore-12.2.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.77.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.77.1-GCCcore-12.3.0.eb
index e3f656498ac..2ba95e419e0 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.77.1-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.77.1-GCCcore-12.3.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.78.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.78.1-GCCcore-13.2.0.eb
index 44fbd9759a5..422a4d64bdf 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.78.1-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.78.1-GCCcore-13.2.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.80.4-GCCcore-13.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.80.4-GCCcore-13.3.0.eb
index f95eacd4a7b..c9832973434 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.80.4-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.80.4-GCCcore-13.3.0.eb
@@ -40,7 +40,7 @@ dependencies = [
 # avoid using hardcoded path to Python binary in build step
 preconfigopts = "export PYTHON=python && "
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 fix_python_shebang_for = ['bin/*']
 
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-10.2.0.eb
index 84d05664734..a931bf06711 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-10.2.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-10.2.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20201008'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dgir=true -Dman=false "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-9.3.0.eb
index a7901baed20..919446d1ca5 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-9.3.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.40.0-GCCcore-9.3.0.eb
@@ -35,7 +35,7 @@ dependencies = [
     ('X11', '20200222'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dgir=true -Dman=false "
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.2.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.2.0.eb
index 4c2a7cd38ba..9e8518b226b 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.2.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20221110'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.3.0.eb
index 3d1ffb27864..10d3f6259d5 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-12.3.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20230603'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-13.2.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-13.2.0.eb
index ac99b2584dd..f996a8b60aa 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.10-GCCcore-13.2.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20231019'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.11-GCCcore-13.3.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.11-GCCcore-13.3.0.eb
index 2ac4237f4c0..f9bca17f28f 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.11-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.11-GCCcore-13.3.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20240607'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-10.3.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-10.3.0.eb
index 30606a25022..9f309a59328 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-10.3.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-10.3.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20210518'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb
index 3e94b11e6ee..16e8ad617c1 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20210802'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.8-GCCcore-11.3.0.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.8-GCCcore-11.3.0.eb
index c730b3e3f19..864564a7d4e 100644
--- a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.8-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.8-GCCcore-11.3.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('X11', '20220504'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 configopts += "-Dgio_sniffing=false -Dintrospection=enabled -Dman=false"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.44.7-GCCcore-9.3.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.44.7-GCCcore-9.3.0.eb
index af783607817..e1854b8c461 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.44.7-GCCcore-9.3.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.44.7-GCCcore-9.3.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.9'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.47.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.47.0-GCCcore-10.2.0.eb
index 815a744fabc..41c12578956 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.47.0-GCCcore-10.2.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.47.0-GCCcore-10.2.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.10'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.48.5-GCCcore-10.3.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.48.5-GCCcore-10.3.0.eb
index b3485ec6566..640910845da 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.48.5-GCCcore-10.3.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.48.5-GCCcore-10.3.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.10'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb
index b750dc8da67..af37465ba69 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.10'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.50.12-GCCcore-12.2.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.50.12-GCCcore-12.2.0.eb
index 2da3f6b7bf5..54b6e391353 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.50.12-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.50.12-GCCcore-12.2.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.12'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.50.14-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.50.14-GCCcore-12.3.0.eb
index a56cf1e8361..36ba5cc3da5 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.50.14-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.50.14-GCCcore-12.3.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.12'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.50.7-GCCcore-11.3.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.50.7-GCCcore-11.3.0.eb
index 3286d679983..f32c52df282 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.50.7-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.50.7-GCCcore-11.3.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.12'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.51.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.51.0-GCCcore-13.2.0.eb
index 9040f4ef2dc..3060d71e56e 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.51.0-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.51.0-GCCcore-13.2.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.13'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.54.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/p/Pango/Pango-1.54.0-GCCcore-13.3.0.eb
index cfbbc1eb16b..05a1663b714 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.54.0-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.54.0-GCCcore-13.3.0.eb
@@ -30,7 +30,7 @@ dependencies = [
     ('FriBidi', '1.0.15'),
 ]
 
-configopts = "--buildtype=release --default-library=both "
+configopts = "--default-library=both "
 
 sanity_check_paths = {
     'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/p/PretextMap/PretextMap-0.1.9-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/PretextMap/PretextMap-0.1.9-GCCcore-12.3.0.eb
index 69972971936..323a73166b0 100644
--- a/easybuild/easyconfigs/p/PretextMap/PretextMap-0.1.9-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/p/PretextMap/PretextMap-0.1.9-GCCcore-12.3.0.eb
@@ -28,7 +28,7 @@ builddependencies = [
 ]
 
 preconfigopts = 'CXX=clang && '
-configure_cmd = 'meson setup --buildtype=release --unity on'
+configopts = '--unity on'
 runtest = 'meson test'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.20.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.20.0-GCCcore-11.3.0.eb
index 88958af9b50..519c759a6f6 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.20.0-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.20.0-GCCcore-11.3.0.eb
@@ -41,6 +41,7 @@ components = [
     ('wayland', version, {
         'checksums': ['b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725'],
         'configopts': "-Ddocumentation=false",
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.25', {
         'checksums': ['f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460'],
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.2.0.eb
index 15fd8e5d655..80bfa4729e9 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.2.0.eb
@@ -44,6 +44,7 @@ components = [
         'source_urls': ['https://gitlab.freedesktop.org/wayland/wayland/-/releases/%(version)s/downloads'],
         'checksums': ['6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac'],
         'configopts': "-Ddocumentation=false",
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.25', {
         'checksums': ['f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460'],
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.3.0.eb
index eb4b2f98bb1..4cf5315a255 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.21.0-GCCcore-11.3.0.eb
@@ -44,6 +44,7 @@ components = [
         'source_urls': ['https://gitlab.freedesktop.org/wayland/wayland/-/releases/%(version)s/downloads'],
         'checksums': ['6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac'],
         'configopts': "-Ddocumentation=false",
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.25', {
         'checksums': ['f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460'],
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.2.0.eb
index 2c77288b85d..e4630b55368 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.2.0.eb
@@ -44,6 +44,7 @@ components = [
         'source_urls': ['https://gitlab.freedesktop.org/wayland/wayland/-/releases/%(version)s/downloads'],
         'configopts': "-Ddocumentation=false",
         'checksums': ['1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842'],
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.32', {
         'source_urls': ['https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/%(version)s/downloads'],
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.3.0.eb
index 78544e0dbfd..7c7f3b824e8 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-12.3.0.eb
@@ -43,6 +43,7 @@ components = [
         'checksums': ['1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842'],
         'sources': [SOURCE_TAR_XZ],
         'configopts': "-Ddocumentation=false",
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.32', {
         'source_urls': ['https://gitlab.freedesktop.org/wayland/%(namelower)s/-/releases/%(version)s/downloads'],
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-13.2.0.eb
index dac0641eed7..0a92131b6c3 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.22.0-GCCcore-13.2.0.eb
@@ -43,6 +43,7 @@ components = [
         'checksums': ['1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842'],
         'sources': [SOURCE_TAR_XZ],
         'configopts': "-Ddocumentation=false",
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.32', {
         'source_urls': ['https://gitlab.freedesktop.org/wayland/%(namelower)s/-/releases/%(version)s/downloads'],
diff --git a/easybuild/easyconfigs/w/Wayland/Wayland-1.23.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/w/Wayland/Wayland-1.23.0-GCCcore-13.3.0.eb
index b774886e5cb..0a27bdb7254 100644
--- a/easybuild/easyconfigs/w/Wayland/Wayland-1.23.0-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/w/Wayland/Wayland-1.23.0-GCCcore-13.3.0.eb
@@ -43,6 +43,7 @@ components = [
         'checksums': ['05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2'],
         'sources': [SOURCE_TAR_XZ],
         'configopts': "-Ddocumentation=false",
+        'ndebug': False,  # required for tests
     }),
     ('wayland-protocols', '1.36', {
         'source_urls': ['https://gitlab.freedesktop.org/wayland/%(namelower)s/-/releases/%(version)s/downloads'],
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.4.1-foss-2021b.eb b/easybuild/easyconfigs/x/xtb/xtb-6.4.1-foss-2021b.eb
index 6df7e85ba2d..ea8b11c4661 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.4.1-foss-2021b.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.4.1-foss-2021b.eb
@@ -20,7 +20,6 @@ builddependencies = [
 
 configopts = "-Dla_backend='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 testopts = 'test -C %(builddir)s/easybuild_obj -t 60'  # Ensure test don't timeout
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.4.1-intel-2021a.eb b/easybuild/easyconfigs/x/xtb/xtb-6.4.1-intel-2021a.eb
index f9f9e4a8212..15edcbaa4ac 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.4.1-intel-2021a.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.4.1-intel-2021a.eb
@@ -21,7 +21,7 @@ builddependencies = [
     ('pkg-config', '0.29.2'),
 ]
 
-configopts = "-Dla_backend='mkl-rt' --buildtype release "
+configopts = "-Dla_backend='mkl-rt' "
 
 runtest = 'meson'
 testopts = 'test -C %(builddir)s/easybuild_obj -t 60'
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.5.0-foss-2021b.eb b/easybuild/easyconfigs/x/xtb/xtb-6.5.0-foss-2021b.eb
index 69bff689c4e..dd0d24c41d4 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.5.0-foss-2021b.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.5.0-foss-2021b.eb
@@ -26,7 +26,6 @@ builddependencies = [
 
 configopts = "-Dla_backend='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 # Ensure test don't timeout and only use one process:
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.5.1-foss-2022a.eb b/easybuild/easyconfigs/x/xtb/xtb-6.5.1-foss-2022a.eb
index 18c4c379b8a..2db0eb37363 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.5.1-foss-2022a.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.5.1-foss-2022a.eb
@@ -21,7 +21,6 @@ builddependencies = [
 
 configopts = "-Dla_backend='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 testopts = 'test -C %(builddir)s/easybuild_obj -t 60'  # Ensure test don't timeout
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.6.0-foss-2022a.eb b/easybuild/easyconfigs/x/xtb/xtb-6.6.0-foss-2022a.eb
index 9fad4ae5452..4bf8c0195d2 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.6.0-foss-2022a.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.6.0-foss-2022a.eb
@@ -28,7 +28,6 @@ builddependencies = [
 
 configopts = "-Dlapack='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 
 runtest = 'meson'
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.6.0-intel-2022a.eb b/easybuild/easyconfigs/x/xtb/xtb-6.6.0-intel-2022a.eb
index 9b68c99495d..ad8919f2ffa 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.6.0-intel-2022a.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.6.0-intel-2022a.eb
@@ -26,8 +26,6 @@ builddependencies = [
     ('pkgconf', '1.8.0'),
 ]
 
-configopts = "--buildtype release "
-
 runtest = 'meson'
 testopts = 'test -C %(builddir)s/easybuild_obj --num-processes 1 -t 60'  # Ensure test don't timeout
 
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2022b.eb b/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2022b.eb
index 7d54b0b36b1..79397e5e507 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2022b.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2022b.eb
@@ -21,7 +21,6 @@ builddependencies = [
 
 configopts = "-Dlapack='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 testopts = 'test -C %(builddir)s/easybuild_obj -t 60'  # Ensure test don't timeout
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2023a.eb b/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2023a.eb
index 7b92e5920d5..6bae81f6f2b 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2023a.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.6.1-gfbf-2023a.eb
@@ -21,7 +21,6 @@ builddependencies = [
 
 configopts = "-Dlapack='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 testopts = 'test -C %(builddir)s/easybuild_obj -t 60'  # Ensure test don't timeout
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.7.0-gfbf-2023a.eb b/easybuild/easyconfigs/x/xtb/xtb-6.7.0-gfbf-2023a.eb
index 81ee768fed0..7a2a1873243 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.7.0-gfbf-2023a.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.7.0-gfbf-2023a.eb
@@ -27,7 +27,6 @@ builddependencies = [
 
 configopts = "-Dlapack='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 pretestopts = 'export OMP_NUM_THREADS=2 && '
diff --git a/easybuild/easyconfigs/x/xtb/xtb-6.7.1-gfbf-2023b.eb b/easybuild/easyconfigs/x/xtb/xtb-6.7.1-gfbf-2023b.eb
index 09d459d356b..d44bc4f84ec 100644
--- a/easybuild/easyconfigs/x/xtb/xtb-6.7.1-gfbf-2023b.eb
+++ b/easybuild/easyconfigs/x/xtb/xtb-6.7.1-gfbf-2023b.eb
@@ -29,7 +29,6 @@ builddependencies = [
 
 configopts = "-Dlapack='custom' "
 configopts += "-Dcustom_libraries='flexiblas' "
-configopts += "--buildtype release "
 
 runtest = 'meson'
 pretestopts = 'export OMP_NUM_THREADS=2 && '

From e7dc57a99de2b45abf4e31e109ae607ffbe1d333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Fri, 11 Oct 2024 17:55:09 +0200
Subject: [PATCH 2/3] Add check to verify that noone adds --buildtype flags in
 meson projects

---
 test/easyconfigs/easyconfigs.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index 6909c4d3e90..246a31c6495 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -1778,6 +1778,13 @@ def template_easyconfig_test(self, spec):
                 fail_msg += f"'{regex.pattern}'"
                 failing_checks.append(fail_msg)
 
+    # meson buildtype should be specified with easyblock parameter "buildtype" not with custom configopts.
+    if ec['easyblock'] == 'MesonNinja':
+        configopts = ec.get('configopts', '', resolve=True)
+        if '--buildtype ' in configopts:
+            fail_msg = "Build type should be specified via MesonNinja parameter 'buildtype' instead of configopts."
+            failing_checks.append(fail_msg)
+
     if failing_checks:
         self.fail('Verification for %s failed:\n' % os.path.basename(spec) + '\n'.join(failing_checks))
 

From 6c8259c5f9e150c9f3e42d8f6468218b72be7da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Mon, 14 Oct 2024 11:28:01 +0200
Subject: [PATCH 3/3] Update test/easyconfigs/easyconfigs.py

Co-authored-by: Kenneth Hoste <kenneth.hoste@ugent.be>
---
 test/easyconfigs/easyconfigs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index 246a31c6495..6d25ff16ece 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -1781,7 +1781,7 @@ def template_easyconfig_test(self, spec):
     # meson buildtype should be specified with easyblock parameter "buildtype" not with custom configopts.
     if ec['easyblock'] == 'MesonNinja':
         configopts = ec.get('configopts', '', resolve=True)
-        if '--buildtype ' in configopts:
+        if '--buildtype ' in configopts or '--buildtype=' in configopts:
             fail_msg = "Build type should be specified via MesonNinja parameter 'buildtype' instead of configopts."
             failing_checks.append(fail_msg)