Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
Date: Tue, 07 Sep 2021 17:32:28
Message-Id: 1631035917.b9353f8086431901cbe7593b1da7148134ae2eac.floppym@gentoo
1 commit: b9353f8086431901cbe7593b1da7148134ae2eac
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 5 15:47:02 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 7 17:31:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9353f80
7
8 sys-fs/zfs-kmod: set CROSS_COMPILE in the environment
9
10 This allows it to be overriden in a local Makefile.
11
12 Closes: https://bugs.gentoo.org/811600
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 7 +++++--
16 sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild | 7 +++++--
17 sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild | 7 +++++--
18 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 7 +++++--
19 4 files changed, 20 insertions(+), 8 deletions(-)
20
21 diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
22 index 68776243c4f..e5b3df641c9 100644
23 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
24 +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
25 @@ -121,8 +121,12 @@ src_configure() {
26
27 filter-ldflags -Wl,*
28
29 + # Set CROSS_COMPILE in the environment.
30 + # This allows the user to override it via make.conf or via a local Makefile.
31 + # https://bugs.gentoo.org/811600
32 + export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
33 +
34 local myconf=(
35 - CROSS_COMPILE="${CHOST}-"
36 HOSTCC="$(tc-getBUILD_CC)"
37 --bindir="${EPREFIX}/bin"
38 --sbindir="${EPREFIX}/sbin"
39 @@ -139,7 +143,6 @@ src_compile() {
40 set_arch_to_kernel
41
42 myemakeargs=(
43 - CROSS_COMPILE="${CHOST}-"
44 HOSTCC="$(tc-getBUILD_CC)"
45 V=1
46 )
47
48 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
49 index 441c7831782..74e838c5764 100644
50 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
51 +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
52 @@ -122,8 +122,12 @@ src_configure() {
53
54 filter-ldflags -Wl,*
55
56 + # Set CROSS_COMPILE in the environment.
57 + # This allows the user to override it via make.conf or via a local Makefile.
58 + # https://bugs.gentoo.org/811600
59 + export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
60 +
61 local myconf=(
62 - CROSS_COMPILE="${CHOST}-"
63 HOSTCC="$(tc-getBUILD_CC)"
64 --bindir="${EPREFIX}/bin"
65 --sbindir="${EPREFIX}/sbin"
66 @@ -140,7 +144,6 @@ src_compile() {
67 set_arch_to_kernel
68
69 myemakeargs=(
70 - CROSS_COMPILE="${CHOST}-"
71 HOSTCC="$(tc-getBUILD_CC)"
72 V=1
73 )
74
75 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
76 index 894d7583448..3aa1db85dc3 100644
77 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
78 +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
79 @@ -122,8 +122,12 @@ src_configure() {
80
81 filter-ldflags -Wl,*
82
83 + # Set CROSS_COMPILE in the environment.
84 + # This allows the user to override it via make.conf or via a local Makefile.
85 + # https://bugs.gentoo.org/811600
86 + export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
87 +
88 local myconf=(
89 - CROSS_COMPILE="${CHOST}-"
90 HOSTCC="$(tc-getBUILD_CC)"
91 --bindir="${EPREFIX}/bin"
92 --sbindir="${EPREFIX}/sbin"
93 @@ -140,7 +144,6 @@ src_compile() {
94 set_arch_to_kernel
95
96 myemakeargs=(
97 - CROSS_COMPILE="${CHOST}-"
98 HOSTCC="$(tc-getBUILD_CC)"
99 V=1
100 )
101
102 diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
103 index 894d7583448..3aa1db85dc3 100644
104 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
105 +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
106 @@ -122,8 +122,12 @@ src_configure() {
107
108 filter-ldflags -Wl,*
109
110 + # Set CROSS_COMPILE in the environment.
111 + # This allows the user to override it via make.conf or via a local Makefile.
112 + # https://bugs.gentoo.org/811600
113 + export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
114 +
115 local myconf=(
116 - CROSS_COMPILE="${CHOST}-"
117 HOSTCC="$(tc-getBUILD_CC)"
118 --bindir="${EPREFIX}/bin"
119 --sbindir="${EPREFIX}/sbin"
120 @@ -140,7 +144,6 @@ src_compile() {
121 set_arch_to_kernel
122
123 myemakeargs=(
124 - CROSS_COMPILE="${CHOST}-"
125 HOSTCC="$(tc-getBUILD_CC)"
126 V=1
127 )