commit:     6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 01:31:38 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 01:31:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a64d9f6

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

 sys-apps/systemd/systemd-225.ebuild  | 3 +++
 sys-apps/systemd/systemd-9999.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sys-apps/systemd/systemd-225.ebuild 
b/sys-apps/systemd/systemd-225.ebuild
index 1a325de..8e44315 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 1a325de..8e44315 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
 }
 

Reply via email to