kernel.spec (LINUX_2_6_11) + distcc (wyłączane przy CROSS_COMPILE)

[romke]

Distcc zadziała. Przy CROSS_COMPILE CC jest zamieniane na gcc.

(podpatrzone z HEAD)

Patch w załączniku.

pozdrawiam
-- 
romke Roman Barczyński  ~~~~  tel. +48 12 632 7365  ~~~~  www.romke.info
____________________________________________ JID/email: romke at estrefa.pl
-------------- next part --------------
--- kernel.spec.r1.441.2.961.2.22	2005-03-18 17:47:51.000000000 +0100
+++ kernel.spec	2005-03-18 14:02:03.000000000 +0100
@@ -607,6 +607,8 @@
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_post_ver}#g' Makefile
+sed -i -e 's#CC.*$(CROSS_COMPILE)gcc#CC		= $(CROSS_COMPILE)$(OURCC)#g' Makefile
+
 
 sed -i 's:\-pipe::' arch/*/Makefile
 
@@ -654,9 +656,14 @@
 }
 
 %if "%{_target_base_arch}" != "%{_arch}"
-CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
+Opts="ARCH=%{_target_base_arch} CROSS_COMPILE=\"%{_target_cpu}-pld-linux-\" OURCC=\"gcc\""
 %else
-CrossOpts=""
+%ifarch %{ix86} alpha sparc ppc
+Opts="OURCC=\"%{__cc}\""
+%endif
+%ifarch sparc64
+Opts="OURCC=\"sparc64-pld-linux-gcc\""
+%endif
 %endif
 
 BuildConfig (){
@@ -693,7 +700,7 @@
 
 	ln -sf arch/%{_target_base_arch}/defconfig .config
 	install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux
-	%{__make} $CrossOpts include/linux/autoconf.h
+	%{__make} $Opts include/linux/autoconf.h
 	if [ "$smp" = "yes" ]; then
 		install include/linux/autoconf.h \
 			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux/autoconf-smp.h
@@ -710,7 +717,7 @@
 BuildKernel() {
 	%{?debug:set -x}
 	echo "Building kernel $1 ..."	
-	%{__make} $CrossOpts mrproper \
+	%{__make} $Opts mrproper \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
 	ln -sf arch/%{_target_base_arch}/defconfig .config
 
@@ -718,10 +725,10 @@
 	sparc32 %{__make} clean \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
 %else
-	%{__make} $CrossOpts clean \
+	%{__make} $Opts clean \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
 %endif
-	%{__make} $CrossOpts include/linux/version.h \
+	%{__make} $Opts include/linux/version.h \
 		%{?with_verbose:V=1}
 
 # make does vmlinux, modules and bzImage at once
@@ -737,7 +744,7 @@
 		%{?with_verbose:V=1}
 %endif
 %else
-	%{__make} $CrossOpts \
+	%{__make} $Opts \
 		%{?with_verbose:V=1}
 %endif
 }
@@ -781,7 +788,7 @@
 	install vmlinuz $KERNEL_INSTALL_DIR/boot/efi/vmlinuz-$KernelVer
 	ln -sf efi/vmlinuz-$KernelVer $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %endif
-	%{__make} $CrossOpts modules_install \
+	%{__make} $Opts modules_install \
 		%{?with_verbose:V=1} \
      		INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
 		KERNELRELEASE=$KernelVer
@@ -813,10 +820,17 @@
 rm -rf $RPM_BUILD_ROOT
 umask 022
 %if "%{_target_base_arch}" != "%{_arch}"
-CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
+Opts="ARCH=%{_target_base_arch} CROSS_COMPILE=\"%{_target_cpu}-pld-linux-\" OURCC=\"gcc\""
 %else
-CrossOpts=""
+%ifarch %{ix86} alpha sparc ppc
+Opts="OURCC=\"%{__cc}\""
 %endif
+%ifarch sparc64
+Opts="OURCC=\"sparc64-pld-linux-gcc\""
+%endif
+%endif
+
+sed -i -e 's#CC.*$(CROSS_COMPILE)$(OURCC)#CC	= $(CROSS_COMPILE)gcc#g' Makefile
 
 install -d $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}
 
@@ -843,7 +857,7 @@
 
 cd $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}
 
-%{__make} $CrossOpts mrproper \
+%{__make} $Opts mrproper \
 	RCS_FIND_IGNORE='-name build-done -prune -o'
 find -name "*~" -exec rm -f "{}" ";"
 find -name "*.orig" -exec rm -f "{}" ";"
@@ -868,8 +882,8 @@
 $RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
 %endif
 
-%{__make} $CrossOpts mrproper
-%{__make} $CrossOpts include/linux/version.h
+%{__make} $Opts mrproper
+%{__make} $Opts include/linux/version.h
 install %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/autoconf.h
 
 %clean