| 1 |
An upper-case name suggests that the variable is exported. This variable |
| 2 |
is also not just used for cross-compiling any more. |
| 3 |
|
| 4 |
Signed-off-by: James Le Cuirot <chewi@g.o> |
| 5 |
--- |
| 6 |
eclass/kernel-2.eclass | 25 +++++++++++++------------ |
| 7 |
1 file changed, 13 insertions(+), 12 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 10 |
index f7fcf15743f0..3c78aa5a8445 100644 |
| 11 |
--- a/eclass/kernel-2.eclass |
| 12 |
+++ b/eclass/kernel-2.eclass |
| 13 |
@@ -745,24 +745,25 @@ cross_pre_c_headers() { |
| 14 |
use headers-only && [[ ${CHOST} != ${CTARGET} ]] |
| 15 |
} |
| 16 |
|
| 17 |
-# @FUNCTION: env_setup_xmakeopts |
| 18 |
+# @FUNCTION: env_setup_kernel_makeopts |
| 19 |
# @USAGE: |
| 20 |
# @DESCRIPTION: |
| 21 |
-# set the ARCH/CROSS_COMPILE when cross compiling |
| 22 |
+# Set the toolchain variables, as well as ARCH and CROSS_COMPILE when |
| 23 |
+# cross-compiling. |
| 24 |
|
| 25 |
-env_setup_xmakeopts() { |
| 26 |
+env_setup_kernel_makeopts() { |
| 27 |
# Kernel ARCH != portage ARCH |
| 28 |
export KARCH=$(tc-arch-kernel) |
| 29 |
|
| 30 |
# When cross-compiling, we need to set the ARCH/CROSS_COMPILE |
| 31 |
# variables properly or bad things happen ! |
| 32 |
- xmakeopts=( ARCH="${KARCH}" ) |
| 33 |
+ KERNEL_MAKEOPTS=( ARCH="${KARCH}" ) |
| 34 |
if [[ ${CTARGET} != ${CHOST} ]] && ! cross_pre_c_headers; then |
| 35 |
- xmakeopts+=( CROSS_COMPILE="${CTARGET}-" ) |
| 36 |
+ KERNEL_MAKEOPTS+=( CROSS_COMPILE="${CTARGET}-" ) |
| 37 |
elif type -p ${CHOST}-ar >/dev/null; then |
| 38 |
- xmakeopts+=( CROSS_COMPILE="${CHOST}-" ) |
| 39 |
+ KERNEL_MAKEOPTS+=( CROSS_COMPILE="${CHOST}-" ) |
| 40 |
fi |
| 41 |
- xmakeopts+=( |
| 42 |
+ KERNEL_MAKEOPTS+=( |
| 43 |
HOSTCC="$(tc-getBUILD_CC)" |
| 44 |
CC="$(tc-getCC)" |
| 45 |
LD="$(tc-getLD)" |
| 46 |
@@ -772,7 +773,7 @@ env_setup_xmakeopts() { |
| 47 |
READELF="$(tc-getREADELF)" |
| 48 |
STRIP="$(tc-getSTRIP)" |
| 49 |
) |
| 50 |
- export xmakeopts |
| 51 |
+ export KERNEL_MAKEOPTS |
| 52 |
} |
| 53 |
|
| 54 |
# @FUNCTION: universal_unpack |
| 55 |
@@ -858,8 +859,8 @@ install_universal() { |
| 56 |
install_headers() { |
| 57 |
local ddir=$(kernel_header_destdir) |
| 58 |
|
| 59 |
- env_setup_xmakeopts |
| 60 |
- emake headers_install INSTALL_HDR_PATH="${ED}"${ddir}/.. "${xmakeopts[@]}" |
| 61 |
+ env_setup_kernel_makeopts |
| 62 |
+ emake headers_install INSTALL_HDR_PATH="${ED}"${ddir}/.. "${KERNEL_MAKEOPTS[@]}" |
| 63 |
|
| 64 |
# let other packages install some of these headers |
| 65 |
rm -rf "${ED}"${ddir}/scsi || die #glibc/uclibc/etc... |
| 66 |
@@ -1425,8 +1426,8 @@ kernel-2_src_unpack() { |
| 67 |
[[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion |
| 68 |
unpack_fix_install_path |
| 69 |
|
| 70 |
- # Setup xmakeopts and cd into sourcetree. |
| 71 |
- env_setup_xmakeopts |
| 72 |
+ # Setup KERNEL_MAKEOPTS and cd into sourcetree. |
| 73 |
+ env_setup_kernel_makeopts |
| 74 |
cd "${S}" || die |
| 75 |
|
| 76 |
if [[ ${K_DEBLOB_AVAILABLE} == 1 ]] && use deblob; then |
| 77 |
-- |
| 78 |
2.39.1 |
Archives