commit:     29718444a91a39f9e2eb9f19b5bb9c183dfa9da0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 31 13:12:46 2025 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 31 13:14:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29718444

sys-devel/binutils: Fix linker search path patch for 2.45

Funny story. We had to update this patch for 2.41 after one line had changed. It
turns out that line was changed by accident, and the change has now been
reverted, so we just need to switch back to the earlier patch!

Closes: https://bugs.gentoo.org/960881
Closes: https://bugs.gentoo.org/960897
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sys-devel/binutils/binutils-2.45.9999.ebuild | 2 +-
 sys-devel/binutils/binutils-2.45.ebuild      | 2 +-
 sys-devel/binutils/binutils-9999.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-devel/binutils/binutils-2.45.9999.ebuild 
b/sys-devel/binutils/binutils-2.45.9999.ebuild
index 97ab5db61c07..e1386793ad98 100644
--- a/sys-devel/binutils/binutils-2.45.9999.ebuild
+++ b/sys-devel/binutils/binutils-2.45.9999.ebuild
@@ -141,7 +141,7 @@ 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 \
+                               eapply 
"${FILESDIR}"/binutils-2.40-linker-search-path.patch \
                                           
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
                        fi
                fi

diff --git a/sys-devel/binutils/binutils-2.45.ebuild 
b/sys-devel/binutils/binutils-2.45.ebuild
index 4a2eebf6b4f3..e14a0f59767d 100644
--- a/sys-devel/binutils/binutils-2.45.ebuild
+++ b/sys-devel/binutils/binutils-2.45.ebuild
@@ -141,7 +141,7 @@ 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 \
+                               eapply 
"${FILESDIR}"/binutils-2.40-linker-search-path.patch \
                                           
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
                        fi
                fi

diff --git a/sys-devel/binutils/binutils-9999.ebuild 
b/sys-devel/binutils/binutils-9999.ebuild
index 97ab5db61c07..e1386793ad98 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -141,7 +141,7 @@ 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 \
+                               eapply 
"${FILESDIR}"/binutils-2.40-linker-search-path.patch \
                                           
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
                        fi
                fi

Reply via email to