From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1608718-garchives=archives.gentoo.org@lists.gentoo.org>
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 F3639158004
for <garchives@archives.gentoo.org>; Fri, 8 Mar 2024 19:59:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3A177E29FB;
Fri, 8 Mar 2024 19:59:32 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 15E51E29FB
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Mar 2024 19:59:32 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 20B5233BDF0
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Mar 2024 19:59:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A3D3C10B0
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Mar 2024 19:59:29 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1709927937.bd72dc1ebb02322e44ad919f8eeab73edafcf3be.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-hppa64/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/binutils-hppa64/binutils-hppa64-2.42-r1.ebuild
X-VCS-Directories: sys-devel/binutils-hppa64/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: bd72dc1ebb02322e44ad919f8eeab73edafcf3be
X-VCS-Branch: master
Date: Fri, 8 Mar 2024 19:59:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fb430696-a607-48ea-a031-8bda30568f2b
X-Archives-Hash: 11b261ff31bf1de314ef59c19e310921
commit: bd72dc1ebb02322e44ad919f8eeab73edafcf3be
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 19:58:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 19:58:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd72dc1e
sys-devel/binutils-hppa64: don't apply prefix hack patch here
'is_cross' fires because of hppa64 vs hppa2.0.
Closes: https://bugs.gentoo.org/925099
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/binutils-hppa64/binutils-hppa64-2.42-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.42-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.42-r1.ebuild
index 0341625022de..9826f659b232 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.42-r1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.42-r1.ebuild
@@ -121,7 +121,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
+ if [[ ${PN} != binutils-hppa64 ]] && { is_cross || use prefix; } ; then
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
"${FILESDIR}"/binutils-2.41-linker-prefix.patch
fi