[gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/, dev-util/mingw64-runtime/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     09976e138441e7ba50a7de8164e44954376034b8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 18:18:37 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 18:32:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09976e13

dev-util/mingw64-runtime: backport race condition fix

Unlike mingw64-toolchain, this doesn't build crt out-of-source
(just does for headers) and is only affected by 1 issue.

Bug: https://bugs.gentoo.org/879537
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../mingw64-runtime-10.0.0-msvcr-extra-race.patch  | 22 ++++++++++++++++++++++
 .../mingw64-runtime-10.0.0-r1.ebuild               |  1 +
 2 files changed, 23 insertions(+)

diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch
new file mode 100644
index 000000000000..3e57c755731a
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/879537
+https://sourceforge.net/p/mingw-w64/mingw-w64/ci/e1b0c1420bbd52ef505c71737c57393ac1397b0a
+(Makefile.in regenerated in 0eeb66e041327b9ca3f6bc1dd1d0a0bd2f46254d)
+--- a/mingw-w64-crt/Makefile.in
++++ b/mingw-w64-crt/Makefile.in
+@@ -77916,11 +77916,11 @@
+ @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
+-@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt10.a: lib32/msvcrt10.mri lib32/libmsvcrt10_def.a lib32/libmsvcrt_common.a
++@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt10.a: lib32/msvcrt10.mri lib32/libmsvcrt10_def.a lib32/libmsvcrt_common.a lib32/libmsvcrt10_extra.a
+ @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
+-@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt20.a: lib32/msvcrt20.mri lib32/libmsvcrt20_def.a lib32/libmsvcrt_common.a
++@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt20.a: lib32/msvcrt20.mri lib32/libmsvcrt20_def.a lib32/libmsvcrt_common.a lib32/libmsvcrt20_extra.a
+ @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
+-@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt40.a: lib32/msvcrt40.mri lib32/libmsvcrt40_def.a lib32/libmsvcrt_common.a
++@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt40.a: lib32/msvcrt40.mri lib32/libmsvcrt40_def.a lib32/libmsvcrt_common.a lib32/libmsvcrt40_extra.a
+ @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
+-@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr70.a: lib32/msvcr70.mri lib32/libmsvcr70_def.a lib32/libmsvcrt_common.a
++@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr70.a: lib32/msvcr70.mri lib32/libmsvcr70_def.a lib32/libmsvcrt_common.a lib32/libmsvcr70_extra.a
+ @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
+-@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr71.a: lib32/msvcr71.mri lib32/libmsvcr71_def.a lib32/libmsvcrt_common.a
++@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr71.a: lib32/msvcr71.mri lib32/libmsvcr71_def.a lib32/libmsvcrt_common.a lib32/libmsvcr71_extra.a
+ @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)

diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index 5d3ff4f8587f..ffbdbd5e4ddd 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -19,6 +19,7 @@ RESTRICT="strip"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+	"${FILESDIR}"/${P}-msvcr-extra-race.patch
 )
 
 pkg_setup() {