[packages/rpm-pld-macros] fix CC=%{__cc} not being part of make command line in kernel macros

atler atler at pld-linux.org
Wed Dec 20 21:05:30 CET 2023


commit 39add43f7a1a04ee1c5faacfaaea770ee5707e0c
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Dec 20 20:51:13 2023 +0100

    fix CC=%{__cc} not being part of make command line in kernel macros
    
    caused by missing \ after ARCH=
    
    ie from last kernel module build on builders (lin_tape for 6.6.7 on x86_64):
    
    + /usr/bin/make -Otarget -j28 -C /usr/src/linux-4.19 clean 'RCS_FIND_IGNORE=-name '\''*.[ks]o'\'' -o' 'M=/tmp/B.a91ebdxq/BUILD/lin_tape-3.0.60' 'HOSTCC=x86_64-pld-linux-gcc' 'SYSSRC=/usr/src/linux-4.19' 'SYSOUT=/tmp/B.a91ebdxq/BUILD/lin_tape-3.0.60/o' 'ARCH=x86_64'
    + CC=x86_64-pld-linux-gcc
    + /usr/bin/make -Otarget -j28 -C /usr/src/linux-4.19 modules 'M=/tmp/B.a91ebdxq/BUILD/lin_tape-3.0.60' 'CONSTIFY_PLUGIN=' 'HOSTCC=x86_64-pld-linux-gcc' 'SYSSRC=/usr/src/linux-4.19' 'SYSOUT=/tmp/B.a91ebdxq/BUILD/lin_tape-3.0.60/o' 'ARCH=x86_64'
      CC [M]  /tmp/B.a91ebdxq/BUILD/lin_tape-3.0.60/fo_util.o
    ...
      LD [M]  /tmp/B.a91ebdxq/BUILD/lin_tape-3.0.60/lin_tape.ko
    + CC=x86_64-pld-linux-gcc
    ...

 macros.kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/macros.kernel b/macros.kernel
index 315db4a..598ba88 100644
--- a/macros.kernel
+++ b/macros.kernel
@@ -176,7 +176,7 @@ powerpc\\\
 	ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
 	%endif															\\\
 %else																\\\
-	ARCH=%_kernel_arch												\\\
+	ARCH=%_kernel_arch												\\\\\\\
 	CC="%{__cc}"													\\\
 %endif																\
 %define	MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/39add43f7a1a04ee1c5faacfaaea770ee5707e0c



More information about the pld-cvs-commit mailing list