summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-09-05 21:31:38 -0400
committerMike Gilbert <floppym@gentoo.org>2015-09-05 21:31:38 -0400
commit6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc (patch)
tree3c912e48a7ce68744e2150c0e19a324259ccd270
parentapp-crypt/zuluCrypt: version bump to 4.7.7 (diff)
downloadgentoo-6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc.tar.gz
gentoo-6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc.tar.bz2
gentoo-6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc.zip
sys-apps/systemd: Export toolchain vars
This prevents any i686 cross toolchain from being used for a multilib build. Bug: https://bugs.gentoo.org/559726 Package-Manager: portage-2.2.20
-rw-r--r--sys-apps/systemd/systemd-225.ebuild3
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild3
2 files changed, 6 insertions, 0 deletions
diff --git a/sys-apps/systemd/systemd-225.ebuild b/sys-apps/systemd/systemd-225.ebuild
index 1a325de67930..8e44315bcf96 100644
--- a/sys-apps/systemd/systemd-225.ebuild
+++ b/sys-apps/systemd/systemd-225.ebuild
@@ -164,6 +164,9 @@ src_configure() {
# Fix systems broken by bug #509454.
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
multilib-minimal_src_configure
}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 1a325de67930..8e44315bcf96 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -164,6 +164,9 @@ src_configure() {
# Fix systems broken by bug #509454.
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
multilib-minimal_src_configure
}