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

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

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]