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 115F5158089 for ; Sun, 10 Sep 2023 07:20:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B66F2BC015; Sun, 10 Sep 2023 07:20:56 +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 43FEC2BC015 for ; Sun, 10 Sep 2023 07:20:56 +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 79746335CDF for ; Sun, 10 Sep 2023 07:20:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E03FBF35 for ; Sun, 10 Sep 2023 07:20:53 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1694330411.6fba26061d757780eed5b0a67fa3dbac9b66c21e.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-devel/gcc/gcc-12.2.0-r2.ebuild X-VCS-Directories: sys-devel/gcc/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 6fba26061d757780eed5b0a67fa3dbac9b66c21e X-VCS-Branch: master Date: Sun, 10 Sep 2023 07:20:53 +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: 6a93cb4d-0d89-4b1d-bbe6-7f4ace229d32 X-Archives-Hash: 99ac7a115347151df64a31c1bb4a0fba commit: 6fba26061d757780eed5b0a67fa3dbac9b66c21e Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 10 07:20:11 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 10 07:20:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6fba2606 sys-devel/gcc-12.2.0-r2: fix ld64 version detection darwin-xtools emits ld64-.* twice, so ensure we only see it once to unbreak the build. Signed-off-by: Fabian Groffen gentoo.org> sys-devel/gcc/gcc-12.2.0-r2.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys-devel/gcc/gcc-12.2.0-r2.ebuild b/sys-devel/gcc/gcc-12.2.0-r2.ebuild index dc747f7475..d7932fa7ae 100644 --- a/sys-devel/gcc/gcc-12.2.0-r2.ebuild +++ b/sys-devel/gcc/gcc-12.2.0-r2.ebuild @@ -86,6 +86,10 @@ src_prepare() { # situation is tricky and needs careful considerations. # For now, just disable support for "-stdlib=libc++". eapply "${FILESDIR}"/gcc-12.2.0-disable-stdlib-option-on-darwin.patch + + # our ld64 is a slight bit different, so tweak expression to not + # get confused and break the build + sed -i -e 's/grep ld64/grep :ld64/' gcc/configure || die fi }