[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/

["Sam James" <sam@gentoo.org>]

commit:     72ef5d93a19e1e0bafa467a5bc086043ea1615f2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 09:44:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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