commit: 5fa54b08bad95df724b7d8d52ddad03d2fab22e8 Author: Marco Sirabella <marco <AT> sirabella <DOT> org> AuthorDate: Sat Mar 2 00:12:27 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 4 01:06:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa54b08
*/*: -Dbuildtype -> EMESON_BUILDTYPE Signed-off-by: Marco Sirabella <marco <AT> sirabella.org> Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36071 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/efl/efl-1.27.0.ebuild | 2 -- dev-libs/glib/glib-2.78.4-r1.ebuild | 2 -- dev-util/intel_clc/intel_clc-24.0.2.ebuild | 3 ++- dev-util/intel_clc/intel_clc-9999.ebuild | 3 ++- media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild | 3 ++- media-libs/mesa/mesa-24.0.2.ebuild | 3 ++- media-libs/mesa/mesa-9999.ebuild | 3 ++- media-libs/rubberband/rubberband-3.3.0-r1.ebuild | 3 ++- sys-auth/elogind/elogind-252.9.ebuild | 3 ++- x11-base/xorg-server/xorg-server-21.1.11.ebuild | 3 ++- x11-base/xorg-server/xorg-server-9999.ebuild | 3 ++- x11-wm/mutter/mutter-45.2-r1.ebuild | 3 ++- x11-wm/mutter/mutter-9999.ebuild | 3 ++- 13 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dev-libs/efl/efl-1.27.0.ebuild b/dev-libs/efl/efl-1.27.0.ebuild index bdb7728d6180..2cbdc3394a50 100644 --- a/dev-libs/efl/efl-1.27.0.ebuild +++ b/dev-libs/efl/efl-1.27.0.ebuild @@ -155,8 +155,6 @@ src_prepare() { src_configure() { local emesonargs=( - -Dbuildtype=plain - -D buffer=false -D build-tests=false -D cocoa=false diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index 18380b00b6af..d1332b9f92dd 100644 --- a/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -188,8 +188,6 @@ multilib_src_configure() { #fi local emesonargs=( - -Dbuildtype=plain - $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-util/intel_clc/intel_clc-24.0.2.ebuild b/dev-util/intel_clc/intel_clc-24.0.2.ebuild index 8bc3bb53f6ba..a92f750a5f14 100644 --- a/dev-util/intel_clc/intel_clc-24.0.2.ebuild +++ b/dev-util/intel_clc/intel_clc-24.0.2.ebuild @@ -59,6 +59,8 @@ pkg_setup() { src_configure() { PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + use debug && EMESON_BUILDTYPE=debug + local emesonargs=( -Dllvm=enabled -Dshared-llvm=enabled @@ -75,7 +77,6 @@ src_configure() { -Dlibunwind=disabled -Dzstd=disabled - -Dbuildtype=$(usex debug debug plain) -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 index 09970ccf3189..f47259e8747d 100644 --- a/dev-util/intel_clc/intel_clc-9999.ebuild +++ b/dev-util/intel_clc/intel_clc-9999.ebuild @@ -59,6 +59,8 @@ pkg_setup() { src_configure() { PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + use debug && EMESON_BUILDTYPE=debug + local emesonargs=( -Dllvm=enabled -Dshared-llvm=enabled @@ -75,7 +77,6 @@ src_configure() { -Dlibunwind=disabled -Dzstd=disabled - -Dbuildtype=$(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) meson_src_configure 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 index e7232a5deb55..732440addaf2 100644 --- a/media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild +++ b/media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild @@ -157,6 +157,8 @@ multilib_src_configure() { echo "${drivers//$'\n'/,}" } + use debug && EMESON_BUILDTYPE=debug + emesonargs+=( -Damber=true $(meson_use test build-tests) @@ -177,7 +179,6 @@ multilib_src_configure() { -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers='' -Dvulkan-drivers='' - -Dbuildtype=$(usex debug debug plain) -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 index 22c74e328dc8..06e8d386c3c3 100644 --- a/media-libs/mesa/mesa-24.0.2.ebuild +++ b/media-libs/mesa/mesa-24.0.2.ebuild @@ -383,6 +383,8 @@ multilib_src_configure() { emesonargs+=(-Dglx=disabled) fi + use debug && EMESON_BUILDTYPE=debug + emesonargs+=( $(meson_use test build-tests) -Dshared-glapi=enabled @@ -402,7 +404,6 @@ multilib_src_configure() { -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - -Dbuildtype=$(usex debug debug plain) -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 index 1032ec5f2994..6a5425d64a54 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -369,6 +369,8 @@ multilib_src_configure() { emesonargs+=(-Dglx=disabled) fi + use debug && EMESON_BUILDTYPE=debug + emesonargs+=( $(meson_use test build-tests) -Dshared-glapi=enabled @@ -390,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[*]}") - -Dbuildtype=$(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) meson_src_configure diff --git a/media-libs/rubberband/rubberband-3.3.0-r1.ebuild b/media-libs/rubberband/rubberband-3.3.0-r1.ebuild index 16cb4c7d2e9d..ee046f7d8982 100644 --- a/media-libs/rubberband/rubberband-3.3.0-r1.ebuild +++ b/media-libs/rubberband/rubberband-3.3.0-r1.ebuild @@ -33,6 +33,8 @@ BDEPEND=" test? ( dev-libs/boost[${MULTILIB_USEDEP}] ) " +EMESON_BUILDTYPE=release + src_prepare() { sed -i \ -e "s/if have_jni/if get_option('jni')/g" \ @@ -60,7 +62,6 @@ multilib_src_configure() { fi local emesonargs=( - -Dbuildtype=release -Dfft=fftw -Dresampler=libsamplerate -Ddefault_library=$(use static-libs && echo "both" || echo "shared") diff --git a/sys-auth/elogind/elogind-252.9.ebuild b/sys-auth/elogind/elogind-252.9.ebuild index 4cb66f04f2f6..8ca3fd96ae06 100644 --- a/sys-auth/elogind/elogind-252.9.ebuild +++ b/sys-auth/elogind/elogind-252.9.ebuild @@ -97,6 +97,8 @@ src_configure() { python_setup + EMESON_BUILDTYPE="$(usex debug debug release)" + local emesonargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" @@ -114,7 +116,6 @@ src_configure() { -Ddefault-kill-user-processes=false -Dacl=$(usex acl true false) -Daudit=$(usex audit true false) - -Dbuildtype=$(usex debug debug release) -Dhtml=$(usex doc auto false) -Dpam=$(usex pam true false) -Dselinux=$(usex selinux true false) 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) diff --git a/x11-wm/mutter/mutter-45.2-r1.ebuild b/x11-wm/mutter/mutter-45.2-r1.ebuild index fd1c366583ec..fa99dc7a1251 100644 --- a/x11-wm/mutter/mutter-45.2-r1.ebuild +++ b/x11-wm/mutter/mutter-45.2-r1.ebuild @@ -152,6 +152,8 @@ python_check_deps() { } src_configure() { + use debug && EMESON_BUILDTYPE=debug + local emesonargs=( # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass # @@ -166,7 +168,6 @@ src_configure() { # - https://bugs.gentoo.org/835786 # - https://forums.gentoo.org/viewtopic-p-8695669.html - -Dbuildtype=$(usex debug debug plain) -Dopengl=true $(meson_use wayland gles2) #gles2_libname diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 0dc94ddab6d1..43f515815af1 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -150,6 +150,8 @@ python_check_deps() { } src_configure() { + use debug && EMESON_BUILDTYPE=debug + local emesonargs=( # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass # @@ -164,7 +166,6 @@ src_configure() { # - https://bugs.gentoo.org/835786 # - https://forums.gentoo.org/viewtopic-p-8695669.html - -Dbuildtype=$(usex debug debug plain) -Dopengl=true $(meson_use wayland gles2) #gles2_libname
