From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1426539-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 DCFA4158094
	for <garchives@archives.gentoo.org>; Wed, 10 Aug 2022 20:36:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2B05DE0B11;
	Wed, 10 Aug 2022 20:36:35 +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 DAB56E0B11
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Aug 2022 20:36:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 1AF7D340F08
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Aug 2022 20:36:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A90B2566
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Aug 2022 20:36:32 +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: <1660163714.c1677ad122d5567fd6a8119f7a493229749e87fe.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.38-r2.ebuild sys-devel/binutils/binutils-2.39.ebuild sys-devel/binutils/binutils-9999.ebuild
X-VCS-Directories: sys-devel/binutils/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c1677ad122d5567fd6a8119f7a493229749e87fe
X-VCS-Branch: master
Date: Wed, 10 Aug 2022 20:36:32 +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: 25befaff-08fa-467c-be28-d3a1dcab94f6
X-Archives-Hash: 562161b16e147accd1656427d841eb73

commit:     c1677ad122d5567fd6a8119f7a493229749e87fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 20:35:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 20:35:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1677ad1

sys-devel/binutils: disable emacs build for cross

Causes collisions w/ cross-*/binutils

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/binutils/binutils-2.38-r2.ebuild | 8 ++++----
 sys-devel/binutils/binutils-2.39.ebuild    | 8 ++++----
 sys-devel/binutils/binutils-9999.ebuild    | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 71cc495774c1..b4b21afc9d21 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -312,7 +312,7 @@ src_compile() {
 		emake V=1 info
 	fi
 
-	use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+	! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
 
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
@@ -406,7 +406,7 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
-	if use emacs ; then
+	if ! is_cross && use emacs ; then
 		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
@@ -423,7 +423,7 @@ pkg_postinst() {
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
 
-	use emacs && elisp-site-regen
+	! is_cross && use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -448,7 +448,7 @@ pkg_postrm() {
 		binutils-config ${CTARGET}-${PV}
 	fi
 
-	use emacs && elisp-site-regen
+	! is_cross && use emacs && elisp-site-regen
 }
 
 # Note [slotting support]

diff --git a/sys-devel/binutils/binutils-2.39.ebuild b/sys-devel/binutils/binutils-2.39.ebuild
index 3cc9c5cdcc87..22183040ab35 100644
--- a/sys-devel/binutils/binutils-2.39.ebuild
+++ b/sys-devel/binutils/binutils-2.39.ebuild
@@ -317,7 +317,7 @@ src_compile() {
 		emake V=1 info
 	fi
 
-	use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+	! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
 
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
@@ -420,7 +420,7 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
-	if use emacs ; then
+	if ! is_cross && use emacs ; then
 		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
@@ -437,7 +437,7 @@ pkg_postinst() {
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
 
-	use emacs && elisp-site-regen
+	! is_cross && use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -462,7 +462,7 @@ pkg_postrm() {
 		binutils-config ${CTARGET}-${PV}
 	fi
 
-	use emacs && elisp-site-regen
+	! is_cross && use emacs && elisp-site-regen
 }
 
 # Note [slotting support]

diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index c3d9de773f3a..c2ab796642a4 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -316,7 +316,7 @@ src_compile() {
 		emake V=1 info
 	fi
 
-	use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+	! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
 
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
@@ -419,7 +419,7 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
-	if use emacs ; then
+	if ! is_cross && use emacs ; then
 		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
@@ -436,7 +436,7 @@ pkg_postinst() {
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
 
-	use emacs && elisp-site-regen
+	! is_cross && use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -461,7 +461,7 @@ pkg_postrm() {
 		binutils-config ${CTARGET}-${PV}
 	fi
 
-	use emacs && elisp-site-regen
+	! is_cross && use emacs && elisp-site-regen
 }
 
 # Note [slotting support]