From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 336F5158021 for ; Fri, 4 Nov 2022 18:33:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76825E07D1; Fri, 4 Nov 2022 18:33:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60FCDE07D1 for ; Fri, 4 Nov 2022 18:33:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7664F34147D for ; Fri, 4 Nov 2022 18:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E43BC6EA for ; Fri, 4 Nov 2022 18:33:21 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1667586763.09976e138441e7ba50a7de8164e44954376034b8.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/, dev-util/mingw64-runtime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild X-VCS-Directories: dev-util/mingw64-runtime/ dev-util/mingw64-runtime/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 09976e138441e7ba50a7de8164e44954376034b8 X-VCS-Branch: master Date: Fri, 4 Nov 2022 18:33:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c429ffc-98a4-4b1f-a3e1-2b28e6f57bb3 X-Archives-Hash: d1355e88ab9d872966cd1ad33e4586d4 commit: 09976e138441e7ba50a7de8164e44954376034b8 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Nov 4 18:18:37 2022 +0000 Commit: Ionen Wolkens gentoo 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 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() {