From 5fa54b08bad95df724b7d8d52ddad03d2fab22e8 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Fri, 1 Mar 2024 16:12:27 -0800 Subject: */*: -Dbuildtype -> EMESON_BUILDTYPE Signed-off-by: Marco Sirabella Signed-off-by: Eli Schwartz Closes: https://github.com/gentoo/gentoo/pull/36071 Signed-off-by: Sam James --- x11-base/xorg-server/xorg-server-21.1.11.ebuild | 3 ++- x11-base/xorg-server/xorg-server-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'x11-base') diff --git a/x11-base/xorg-server/xorg-server-21.1.11.ebuild b/x11-base/xorg-server/xorg-server-21.1.11.ebuild index aac526f8a150..34c0ed8d3a5f 100644 --- a/x11-base/xorg-server/xorg-server-21.1.11.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.11.ebuild @@ -110,13 +110,14 @@ src_configure() { # bug #835653 use x86 && replace-flags -Os -O2 + use debug && EMESON_BUILDTYPE=debug + # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies local emesonargs=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11" - -Dbuildtype=$(usex debug debug plain) -Db_ndebug=$(usex debug false true) $(meson_use !minimal dri1) $(meson_use !minimal dri2) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 89bf977b8290..6cff794746b4 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -105,13 +105,14 @@ src_configure() { # bug #835653 use x86 && replace-flags -Os -O2 + use debug && EMESON_BUILDTYPE=debug + # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies local emesonargs=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11" - -Dbuildtype=$(usex debug debug plain) -Db_ndebug=$(usex debug false true) $(meson_use !minimal dri1) $(meson_use !minimal dri2) -- cgit v1.2.3-65-gdbad