From 7c7c353858a020153be5dba78480b91a28c7a05b Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Aug 2021 14:59:12 +0200 Subject: meson.bbclass: Make the default buildtype "debug" if DEBUG_BUILD is 1 Setting the Meson buildtype to "debug" will by default only enable the -g option to the compiler, which should not matter for OE-Core as it is already enabled by setting DEBUG_BUILD to 1 in the first place. However, if the package uses get_option('debug') in its meson.build files to enable package specific debug code, this will now trigger as intended. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 2beed89d11..e124d18144 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -12,7 +12,8 @@ MESON_SOURCEPATH = "${S}" def noprefix(var, d): return d.getVar(var).replace(d.getVar('prefix') + '/', '', 1) -MESON_BUILDTYPE ?= "plain" +MESON_BUILDTYPE ?= "${@oe.utils.vartrue('DEBUG_BUILD', 'debug', 'plain', d)}" +MESON_BUILDTYPE[vardeps] += "DEBUG_BUILD" MESONOPTS = " --prefix ${prefix} \ --buildtype ${MESON_BUILDTYPE} \ --bindir ${@noprefix('bindir', d)} \ -- cgit 1.2.3-korg