From 4db35a4d000e0c754f829eb05e6cd7ce64fa256c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Tue, 1 Oct 2024 15:38:37 +0000
Subject: [PATCH] Add NDEBUG flag to meson builds

---
 easybuild/easyblocks/generic/mesonninja.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/easybuild/easyblocks/generic/mesonninja.py b/easybuild/easyblocks/generic/mesonninja.py
index 03b4f2c86d..919568c42c 100644
--- a/easybuild/easyblocks/generic/mesonninja.py
+++ b/easybuild/easyblocks/generic/mesonninja.py
@@ -69,9 +69,9 @@ def build_type(self):
         # While we do set optimization and debug flag separately, build scripts may be adding additional
         # defines and flags based on the build_type as well so we pick the closest match.
         if build_type is None:
-            if self.toolchain.options.get('noopt', None):  # also implies debug but is the closest match
+            if self.toolchain.options.get('noopt', False):  # also implies debug but is the closest match
                 build_type = 'debug'
-            elif self.toolchain.options.get('debug', None):
+            elif self.toolchain.options.get('debug', False):
                 build_type = 'debugoptimized'
             else:
                 build_type = 'release'
@@ -121,7 +121,7 @@ def configure_step(self, cmd_prefix=''):
         build_dir = self.cfg.get('build_dir') or self.start_dir
 
         cmd = ("%(preconfigopts)s %(configure_cmd)s --prefix %(installdir)s --buildtype %(buildtype)s %(configopts)s "
-               "--optimization %(optimization)s %(debug)s %(source_dir)s") % {
+               "--optimization %(optimization)s %(debug)s %(source_dir)s %(ndebug)s") % {
             'configopts': self.cfg['configopts'],
             'configure_cmd': configure_cmd,
             'installdir': self.installdir,
@@ -130,6 +130,7 @@ def configure_step(self, cmd_prefix=''):
             'buildtype': self.build_type,
             'optimization': self.optimization,
             'debug': '--debug' if self.toolchain.options.get('debug', False) else '',
+            'ndebug': '' if self.toolchain.options.get('noopt', False) else '-Db_ndebug=true'
         }
         res = run_shell_cmd(cmd)
         return res.output
@@ -144,7 +145,7 @@ def build_step(self, verbose=False, path=None):
         if self.cfg['parallel']:
             parallel = "-j %s" % self.cfg['parallel']
 
-        cmd = "%(prebuildopts)s %(build_cmd)s %(parallel)s %(buildopts)s" % {
+        cmd = "%(prebuildopts)s %(build_cmd)s -v %(parallel)s %(buildopts)s" % {
             'buildopts': self.cfg['buildopts'],
             'build_cmd': build_cmd,
             'parallel': parallel,