.

weBj8 · Dec 8, 2024 · 3dd70c4 · 3dd70c4
1 parent ed71193
commit 3dd70c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/app-emulation/wine-osu/wine-osu-9.21-r2.ebuild b/app-emulation/wine-osu/wine-osu-9.21-r2.ebuild
@@ -387,7 +387,9 @@ src_configure() {
 
 		local _CROSS_FLAGS="${_common_cflags} ${CPPFLAGS}"
 		local _CROSS_LD_FLAGS="${_CROSS_FLAGS} -Wl,-O3,--sort-common,--as-needed,--file-alignment=4096"
-
+
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
 		conf+=(
 			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
 			ac_cv_prog_i386_CC="${mingwcc_x86}"

diff --git a/app-emulation/wine-osu/wine-osu-9.22-r1.ebuild b/app-emulation/wine-osu/wine-osu-9.22-r1.ebuild
@@ -376,28 +376,31 @@ src_configure() {
 		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
 
 		# # From https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=wine-osu-spectator-wow64
+		# -ffunction-sections -fdata-sections
 		local _common_cflags="-pipe -O3 -march=native -fomit-frame-pointer -fwrapv -fno-strict-aliasing \
-		-ffunction-sections -fdata-sections \
 		-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -w"
-		local _native_common_cflags="-fuse-linker-plugin -fdevirtualize-at-ltrans -flto-partition=one -flto -Wl,-flto"
+		local _native_common_cflags="-static-libgcc -fuse-linker-plugin -fdevirtualize-at-ltrans -flto-partition=one -flto -Wl,-flto"
 		local _extra_native_flags="-floop-nest-optimize -fgraphite-identity -floop-strip-mine" # graphite opts
 		local _lto_error_flags="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing"
 		export CPPFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -D_NDEBUG"
-		local _GCC_FLAGS="${_common_cflags} ${_extra_native_flags} ${CPPFLAGS}"
+		local _GCC_FLAGS="${_common_cflags} ${_lto_error_flags} ${_extra_native_flags} ${_lto_error_flags} ${CPPFLAGS}"
 		local _LD_FLAGS="${_GCC_FLAGS} -Wl,-O3,--sort-common,--as-needed,--gc-sections -static-libgcc -fuse-ld=mold"
 
 		local _CROSS_FLAGS="${_common_cflags} ${CPPFLAGS}"
 		local _CROSS_LD_FLAGS="${_CROSS_FLAGS} -Wl,-O3,--sort-common,--as-needed,--file-alignment=4096,--gc-sections"
+
+		# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+		append-cflags -std=gnu17
 
 		conf+=(
 			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
 			ac_cv_prog_i386_CC="${mingwcc_x86}"
 
 			CPPFLAGS="${CPPFLAGS}"
-			CFLAGS="${CFLAGS} ${_GCC_FLAGS} -std=gnu17"
-			CXXFLAGS="${CXXFLAGS} ${_GCC_FLAGS} -std=gnu++17"
-			CROSSCFLAGS="${CROSSCFLAGS} ${_CROSS_FLAGS} -std=gnu17"
-			CROSSCXXFLAGS="${CROSSCXXFLAGS} ${_CROSS_FLAGS} -std=gnu++17"
+			CFLAGS="${CFLAGS} ${_GCC_FLAGS}"
+			CXXFLAGS="${CXXFLAGS} ${_GCC_FLAGS}"
+			CROSSCFLAGS="${CROSSCFLAGS} ${_CROSS_FLAGS}"
+			CROSSCXXFLAGS="${CROSSCXXFLAGS} ${_CROSS_FLAGS}"
 			LDFLAGS="${LDFLAGS} ${_LD_FLAGS}"
 			CROSSLDFLAGS="${CROSSLDFLAGS} ${_CROSS_LD_FLAGS}"
 		)