commit:     b9353f8086431901cbe7593b1da7148134ae2eac
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 15:47:02 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 17:31:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9353f80

sys-fs/zfs-kmod: set CROSS_COMPILE in the environment

This allows it to be overriden in a local Makefile.

Closes: https://bugs.gentoo.org/811600
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 7 +++++--
 sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild | 7 +++++--
 sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild | 7 +++++--
 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild  | 7 +++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index 68776243c4f..e5b3df641c9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -121,8 +121,12 @@ src_configure() {
 
        filter-ldflags -Wl,*
 
+       # Set CROSS_COMPILE in the environment.
+       # This allows the user to override it via make.conf or via a local 
Makefile.
+       # https://bugs.gentoo.org/811600
+       export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
        local myconf=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                --bindir="${EPREFIX}/bin"
                --sbindir="${EPREFIX}/sbin"
@@ -139,7 +143,6 @@ src_compile() {
        set_arch_to_kernel
 
        myemakeargs=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                V=1
        )

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
index 441c7831782..74e838c5764 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
@@ -122,8 +122,12 @@ src_configure() {
 
        filter-ldflags -Wl,*
 
+       # Set CROSS_COMPILE in the environment.
+       # This allows the user to override it via make.conf or via a local 
Makefile.
+       # https://bugs.gentoo.org/811600
+       export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
        local myconf=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                --bindir="${EPREFIX}/bin"
                --sbindir="${EPREFIX}/sbin"
@@ -140,7 +144,6 @@ src_compile() {
        set_arch_to_kernel
 
        myemakeargs=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                V=1
        )

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
index 894d7583448..3aa1db85dc3 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
@@ -122,8 +122,12 @@ src_configure() {
 
        filter-ldflags -Wl,*
 
+       # Set CROSS_COMPILE in the environment.
+       # This allows the user to override it via make.conf or via a local 
Makefile.
+       # https://bugs.gentoo.org/811600
+       export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
        local myconf=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                --bindir="${EPREFIX}/bin"
                --sbindir="${EPREFIX}/sbin"
@@ -140,7 +144,6 @@ src_compile() {
        set_arch_to_kernel
 
        myemakeargs=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                V=1
        )

diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 894d7583448..3aa1db85dc3 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -122,8 +122,12 @@ src_configure() {
 
        filter-ldflags -Wl,*
 
+       # Set CROSS_COMPILE in the environment.
+       # This allows the user to override it via make.conf or via a local 
Makefile.
+       # https://bugs.gentoo.org/811600
+       export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
        local myconf=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                --bindir="${EPREFIX}/bin"
                --sbindir="${EPREFIX}/sbin"
@@ -140,7 +144,6 @@ src_compile() {
        set_arch_to_kernel
 
        myemakeargs=(
-               CROSS_COMPILE="${CHOST}-"
                HOSTCC="$(tc-getBUILD_CC)"
                V=1
        )

Reply via email to