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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7422D158095 for ; Wed, 29 Jun 2022 17:22:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DF0AE0BAD; Wed, 29 Jun 2022 17:22:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 77C0CE0BA4 for ; Wed, 29 Jun 2022 17:22:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 94C1F341A67 for ; Wed, 29 Jun 2022 17:22:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0784251E for ; Wed, 29 Jun 2022 17:22:51 +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: <1656523356.d8f263e503f54eb05f2c764ae443ea2e08e47366.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-toolchain/, dev-util/mingw64-toolchain/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild X-VCS-Directories: dev-util/mingw64-toolchain/ dev-util/mingw64-toolchain/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: d8f263e503f54eb05f2c764ae443ea2e08e47366 X-VCS-Branch: master Date: Wed, 29 Jun 2022 17:22:51 +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: cbeca4b9-efca-49d7-8e7a-ca1b7246b2c8 X-Archives-Hash: bed1df26a02af8f76704251b23f38448 commit: d8f263e503f54eb05f2c764ae443ea2e08e47366 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Jun 29 16:23:21 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jun 29 17:22:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f263e5 dev-util/mingw64-toolchain: fix build with musl and gcc:12 Closes: https://bugs.gentoo.org/855002 Signed-off-by: Ionen Wolkens gentoo.org> .../files/gcc-11.3.0-musl-calloc.patch | 33 ++++++++++++++++++++++ .../mingw64-toolchain-10.0.0-r1.ebuild | 1 + 2 files changed, 34 insertions(+) diff --git a/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch b/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch new file mode 100644 index 000000000000..71602df60cca --- /dev/null +++ b/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/855002 +https://gcc.gnu.org/PR104799 +https://gcc.gnu.org/PR106102 +--- a/gcc/gcc/cp/mapper-client.cc ++++ b/gcc/gcc/cp/mapper-client.cc +@@ -29,2 +29,3 @@ + #define INCLUDE_MAP ++#include + #include "system.h" +--- a/gcc/gcc/cp/mapper-resolver.cc ++++ b/gcc/gcc/cp/mapper-resolver.cc +@@ -27,2 +27,3 @@ + #define INCLUDE_MAP ++#include + #include "system.h" +--- a/gcc/gcc/cp/module.cc ++++ b/gcc/gcc/cp/module.cc +@@ -206,2 +206,3 @@ + #define INCLUDE_VECTOR ++#include + #include "system.h" +--- a/gcc/libcc1/libcc1plugin.cc ++++ b/gcc/libcc1/libcc1plugin.cc +@@ -19,2 +19,3 @@ + ++#include + #include +--- a/gcc/libcc1/libcp1plugin.cc ++++ b/gcc/libcc1/libcp1plugin.cc +@@ -20,2 +20,3 @@ + ++#include + #include diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild index c0d573454f7f..c902601aa43c 100644 --- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild +++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild @@ -44,6 +44,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch "${FILESDIR}"/gcc-11.3.0-plugin-objdump.patch + "${FILESDIR}"/gcc-11.3.0-musl-calloc.patch ) pkg_pretend() {