From e8d5c3a58d28178bfd7a074791c0d326ccff0b9a Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 18 Nov 2024 17:35:19 -0500 Subject: [PATCH] app-emulation/wine-vanilla: pass -std=gnu17 for gcc15 for now Bug: https://bugs.gentoo.org/943849 Signed-off-by: Ionen Wolkens --- app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 3 +++ app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 3 +++ app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild | 3 +++ app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild | 3 +++ app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild | 3 +++ app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild | 3 +++ app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 3 +++ 7 files changed, 21 insertions(+) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild index bb1d6d125649b..dfb613e944add 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -261,6 +261,9 @@ src_configure() { use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # temporary workaround for tc-ld-force-bfd not yet enforcing with mold # https://github.com/gentoo/gentoo/pull/28355 [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild index 3402577a7c2dc..1f13198157915 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -255,6 +255,9 @@ src_configure() { use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # temporary workaround for tc-ld-force-bfd not yet enforcing with mold # https://github.com/gentoo/gentoo/pull/28355 [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild index c8cced4996446..977ede6ca160f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild @@ -281,6 +281,9 @@ src_configure() { filter-flags -Wl,--gc-sections # runtime issues (bug #931329) use custom-cflags || strip-flags # can break in obscure ways at runtime + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) # (do self test until https://github.com/gentoo/gentoo/pull/28355) if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]] diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild index 838210bfb98a8..9c6db6a38766c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild @@ -284,6 +284,9 @@ src_configure() { filter-flags -Wl,--gc-sections # runtime issues (bug #931329) use custom-cflags || strip-flags # can break in obscure ways at runtime + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) # (do self test until https://github.com/gentoo/gentoo/pull/28355) if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]] diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild index 6feb10a574299..28fa6e38456c0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild @@ -284,6 +284,9 @@ src_configure() { filter-flags -Wl,--gc-sections # runtime issues (bug #931329) use custom-cflags || strip-flags # can break in obscure ways at runtime + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) # (do self test until https://github.com/gentoo/gentoo/pull/28355) if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]] diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild index 6feb10a574299..28fa6e38456c0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild @@ -284,6 +284,9 @@ src_configure() { filter-flags -Wl,--gc-sections # runtime issues (bug #931329) use custom-cflags || strip-flags # can break in obscure ways at runtime + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) # (do self test until https://github.com/gentoo/gentoo/pull/28355) if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]] diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 6feb10a574299..28fa6e38456c0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -284,6 +284,9 @@ src_configure() { filter-flags -Wl,--gc-sections # runtime issues (bug #931329) use custom-cflags || strip-flags # can break in obscure ways at runtime + # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) + append-cflags -std=gnu17 + # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) # (do self test until https://github.com/gentoo/gentoo/pull/28355) if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]