SPECS (LINUX_2_6): kernel.spec - simplified: always use ARCH=, no ...

[qboosh]

Author: qboosh                       Date: Sat Aug 11 15:06:15 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- simplified: always use ARCH=, no need for special make cases for sparc

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1748 -> 1.441.2.1749) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1748 SPECS/kernel.spec:1.441.2.1749
--- SPECS/kernel.spec:1.441.2.1748	Sat Aug 11 14:48:33 2007
+++ SPECS/kernel.spec	Sat Aug 11 17:06:09 2007
@@ -426,16 +426,26 @@
 	%define	DepMod /bin/true
 
 	%if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
+	%define	CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
+	%define	DepMod /sbin/depmod
+	%endif
+
+	%if "%{_arch}" == "sparc64" && "%{_target_base_arch}" == "sparc"
+	%define	CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
 	%define	DepMod /sbin/depmod
 	%endif
 
 	%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
-	%define	CrossOpts ARCH=%{_target_base_arch}
+	%define	CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
 	%define	DepMod /sbin/depmod
 	%endif
 
 %else
-	%define CrossOpts CC="%{__cc}"
+	%ifarch ppc ppc64
+	%define CrossOpts ARCH=powerpc CC="%{__cc}"
+	%else
+	%define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
+	%endif
 	%define	DepMod /sbin/depmod
 %endif
 
@@ -1146,13 +1156,8 @@
 		RCS_FIND_IGNORE='-name build-done -prune -o'
 	ln -sf arch/%{_target_base_arch}/defconfig .config
 
-%ifarch sparc
-	ARCH=sparc %{__make} clean \
-		RCS_FIND_IGNORE='-name build-done -prune -o'
-%else
 	%{__make} %CrossOpts clean \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
-%endif
 	%{__make} %CrossOpts include/linux/version.h \
 		%{?with_verbose:V=1}
 
@@ -1160,7 +1165,6 @@
 		%{?with_verbose:V=1}
 
 # make does vmlinux, modules and bzImage at once
-%ifarch sparc sparc64
 %ifarch sparc64
 	%{__make} %CrossOpts image \
 		%{?with_verbose:V=1}
@@ -1168,10 +1172,6 @@
 	%{__make} %CrossOpts modules \
 		%{?with_verbose:V=1}
 %else
-	ARCH=sparc %{__make} \
-		%{?with_verbose:V=1}
-%endif
-%else
 	%{__make} %CrossOpts \
 		%{?with_verbose:V=1}
 %endif
@@ -1600,6 +1600,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1749  2007/08/11 15:06:09  qboosh
+- simplified: always use ARCH=, no need for special make cases for sparc
+
 Revision 1.441.2.1748  2007/08/11 12:48:33  zbyniu
 - rndis modules now in net/usb not usb/net
 - problematic patches commented out; status - builds with grsec_full on ac at amd64
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1748&r2=1.441.2.1749&f=u