From 7912c161cfb3e56c512b4d3267c779cbad458daa Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:13:06 +0000 Subject: [PATCH] eclass/meson: Sync with Gentoo It's from Gentoo commit 21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4. --- .../src/third_party/portage-stable/eclass/meson.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass index f7cf8a0722..d8bd93082e 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass @@ -1,4 +1,4 @@ -# Copyright 2017-2023 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: meson.eclass @@ -43,9 +43,9 @@ _MESON_ECLASS=1 inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs -BDEPEND=">=dev-util/meson-1.2.1 +BDEPEND=">=dev-build/meson-1.2.1 ${NINJA_DEPEND} - dev-util/meson-format-array + dev-build/meson-format-array " # @ECLASS_VARIABLE: BUILD_DIR @@ -334,6 +334,10 @@ meson_src_configure() { # It's Gentoo policy to not have builds die on blanket -Werror, as it's # an upstream development matter. bug #754279. -Dwerror=false + + # Prevent projects from enabling LTO by default. In Gentoo, LTO is + # enabled via setting *FLAGS appropriately. + -Db_lto=false ) if [[ -n ${EMESON_BUILDTYPE} ]]; then