commit:     a0c549f2d2c9dd3d781c69d91b74b76103d74f15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 21:56:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 21:56:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0c549f2

app-arch/libdeflate: add workaround for ifcombine bug

No revbump given it only affects 2-3 snapshots of GCC 15 and will be
fixed soon.

Bug: https://gcc.gnu.org/PR118206
Closes: https://bugs.gentoo.org/946876
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/libdeflate/libdeflate-1.23.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-arch/libdeflate/libdeflate-1.23.ebuild 
b/app-arch/libdeflate/libdeflate-1.23.ebuild
index d44e68b21d11..b2a16ab571fc 100644
--- a/app-arch/libdeflate/libdeflate-1.23.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
 HOMEPAGE="https://github.com/ebiggers/libdeflate";
@@ -35,6 +35,9 @@ PATCHES=(
 )
 
 src_configure() {
+       # Workaround for bug #946876 (gcc PR118206)
+       tc-is-gcc && [[ $(gcc-major-version) -eq 15 ]] && append-flags 
-fdisable-tree-ifcombine
+
        local mycmakeargs=(
                -DLIBDEFLATE_BUILD_SHARED_LIB="yes"
                -DLIBDEFLATE_BUILD_STATIC_LIB="no"

Reply via email to