*/*: -Dbuildtype -> EMESON_BUILDTYPE

Signed-off-by: Marco Sirabella <marco@sirabella.org>
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36071
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Marco Sirabella
2024-03-01 16:12:27 -08:00
committed by Sam James
parent 2be521e30e
commit 5fa54b08ba
13 changed files with 22 additions and 15 deletions

View File

@@ -155,8 +155,6 @@ src_prepare() {
src_configure() {
local emesonargs=(
-Dbuildtype=plain
-D buffer=false
-D build-tests=false
-D cocoa=false

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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")

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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