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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0F0F158042 for ; Sun, 10 Nov 2024 09:44:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09F36E090A; Sun, 10 Nov 2024 09:44:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAD09E090A for ; Sun, 10 Nov 2024 09:44: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 41BAA33BF36 for ; Sun, 10 Nov 2024 09:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 970D9AED for ; Sun, 10 Nov 2024 09:44:54 +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: <1731231842.72ef5d93a19e1e0bafa467a5bc086043ea1615f2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils/binutils-2.43-r2.ebuild X-VCS-Directories: sys-devel/binutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 72ef5d93a19e1e0bafa467a5bc086043ea1615f2 X-VCS-Branch: master Date: Sun, 10 Nov 2024 09:44:54 +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: 6f5098cc-1ad6-47ae-8690-eedaa5049898 X-Archives-Hash: 23f5bee92d826181eb9bda4a6b1c411e commit: 72ef5d93a19e1e0bafa467a5bc086043ea1615f2 Author: Sam James gentoo org> AuthorDate: Sun Nov 10 09:44:02 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 10 09:44:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ef5d93 sys-devel/binutils: fix cross patch for 2.43-r2 0037-PR32300-dependency-file-link-dependencies-are-not-al.patch conflicts with binutils-2.43-linker-search-path.patch but we can go back to the one before from 2.42 given that 0037 is a revert. Closes: https://bugs.gentoo.org/943162 Signed-off-by: Sam James gentoo.org> sys-devel/binutils/binutils-2.43-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/binutils/binutils-2.43-r2.ebuild b/sys-devel/binutils/binutils-2.43-r2.ebuild index 3a2ace907f82..18d5aa85e3df 100644 --- a/sys-devel/binutils/binutils-2.43-r2.ebuild +++ b/sys-devel/binutils/binutils-2.43-r2.ebuild @@ -131,8 +131,8 @@ src_prepare() { # This is applied conditionally for now just out of caution. # It should be okay on non-prefix systems though. See bug #892549. if is_cross || use prefix; then - eapply "${FILESDIR}"/binutils-2.43-linker-search-path.patch \ - "${FILESDIR}"/binutils-2.43-linker-prefix.patch + eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \ + "${FILESDIR}"/binutils-2.41-linker-prefix.patch fi fi fi