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 BA2D3158041 for ; Fri, 23 Feb 2024 07:46:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDE1F2BC02D; Fri, 23 Feb 2024 07:46:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 B9FF62BC02D for ; Fri, 23 Feb 2024 07:46:19 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB15334320E for ; Fri, 23 Feb 2024 07:46:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BB911121 for ; Fri, 23 Feb 2024 07:46:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1708674368.0c5af65cfb92b7702f170999488c970fc278d9a2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0c5af65cfb92b7702f170999488c970fc278d9a2 X-VCS-Branch: master Date: Fri, 23 Feb 2024 07:46:17 +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: d14503b6-dea5-4a04-95df-f18f88db2c83 X-Archives-Hash: 965fffedea25438d2f942b6932742463 commit: 0c5af65cfb92b7702f170999488c970fc278d9a2 Author: Sam James gentoo org> AuthorDate: Fri Feb 23 07:16:07 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 23 07:46:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5af65c toolchain.eclass: allow fixincludes for mingw & special MIPS target config/i386/t-cygming always sets STMP_FIXINC regardless of the configure arg for fixincludes, so don't disable it there. The only other case is config/mips/t-sdemtk which I've handled too. Exposed by 0b75d3ce0bae8240c28c6a8f191f5130548f8475. Bug: https://bugs.gentoo.org/905118 Closes: https://bugs.gentoo.org/925204 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 67a04f297d6b..fef38790922c 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1309,6 +1309,22 @@ toolchain_src_configure() { GCC_RUN_FIXINCLUDES=1 fi + case ${CBUILD}-${CHOST}-${CTARGET} in + *i686-w64-mingw32*|*x86_64-w64-mingw32*) + # config/i386/t-cygming requires fixincludes (bug #925204) + GCC_RUN_FIXINCLUDES=1 + ;; + *mips*-sde-elf*) + # config/mips/t-sdemtk needs fixincludes too (bug #925204) + # It maps to mips*-sde-elf*, but only with --without-newlib. + if [[ ${confgcc} != *with-newlib* ]] ; then + GCC_RUN_FIXINCLUDES=1 + fi + ;; + *) + ;; + esac + if [[ ${GCC_RUN_FIXINCLUDES} == 1 ]] ; then confgcc+=( --enable-fixincludes ) else