meson.eclass */*: move -Db_ndebug into eclass

Of note is that this introduces a change in the build process for some packages eg glib that didn't previously set -Db_ndebug when use debug Signed-off-by: Marco Sirabella <marco@sirabella.org>
gentoo · Mar 3, 2024 · 78312c6 · 78312c6
1 parent 4b7e9a9
commit 78312c6
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 10 deletions.
diff --git a/dev-util/intel_clc/intel_clc-24.0.2.ebuild b/dev-util/intel_clc/intel_clc-24.0.2.ebuild
@@ -74,8 +74,6 @@ src_configure() {
 		-Dglx=disabled
 		-Dlibunwind=disabled
 		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
 	)
 	meson_src_configure
 }

diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_clc/intel_clc-9999.ebuild
@@ -74,8 +74,6 @@ src_configure() {
 		-Dglx=disabled
 		-Dlibunwind=disabled
 		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
 	)
 	meson_src_configure
 }

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
@@ -368,7 +368,8 @@ setup_meson_src_configure() {
 
 
 	if in_iuse debug; then
-		use debug && EMESON_BUILDTYPE=debug
+		MESONARGS+=( -Db_ndebug=$(usex debug false true) )
+		use debug && export EMESON_BUILDTYPE=debug
 	fi
 	if [[ -n ${EMESON_BUILDTYPE} ]]; then
 		MESONARGS+=( -Dbuildtype="${EMESON_BUILDTYPE}" )

diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild
@@ -177,7 +177,6 @@ multilib_src_configure() {
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=''
 		-Dvulkan-drivers=''
-		-Db_ndebug=$(usex debug false true)
 	)
 	meson_src_configure
 }

diff --git a/media-libs/mesa/mesa-24.0.2.ebuild b/media-libs/mesa/mesa-24.0.2.ebuild
@@ -402,7 +402,6 @@ multilib_src_configure() {
 		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
 	)
 	meson_src_configure
 }

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
@@ -392,7 +392,6 @@ multilib_src_configure() {
 		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
 	)
 	meson_src_configure
 }

diff --git a/x11-base/xorg-server/xorg-server-21.1.11.ebuild b/x11-base/xorg-server/xorg-server-21.1.11.ebuild
@@ -116,7 +116,6 @@ src_configure() {
 	local emesonargs=(
 		--localstatedir "${EPREFIX}/var"
 		--sysconfdir "${EPREFIX}/etc/X11"
-		-Db_ndebug=$(usex debug false true)
 		$(meson_use !minimal dri1)
 		$(meson_use !minimal dri2)
 		$(meson_use !minimal dri3)

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -111,7 +111,6 @@ src_configure() {
 	local emesonargs=(
 		--localstatedir "${EPREFIX}/var"
 		--sysconfdir "${EPREFIX}/etc/X11"
-		-Db_ndebug=$(usex debug false true)
 		$(meson_use !minimal dri1)
 		$(meson_use !minimal dri2)
 		$(meson_use !minimal dri3)