SPECS (LINUX_2_6): kernel.spec - x86-64 has biarch compiler, so we...

[pluto]

Author: pluto                        Date: Fri Jun 24 15:23:33 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- x86-64 has biarch compiler, so we don't need to use a cross compiler.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1130 -> 1.441.2.1131) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1130 SPECS/kernel.spec:1.441.2.1131
--- SPECS/kernel.spec:1.441.2.1130	Fri Jun 24 14:46:35 2005
+++ SPECS/kernel.spec	Fri Jun 24 17:23:28 2005
@@ -724,16 +724,22 @@
 }
 
 %if "%{_target_base_arch}" != "%{_arch}"
-CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
-export DEPMOD=/bin/true
+    CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
+    export DEPMOD=/bin/true
+    %if "%{_arch}" == "x86_64"
+	%if "%{_target_base_arch}" == "i386"
+	    CrossOpts="ARCH=%{_target_base_arch}"
+	    unset DEPMOD
+	%endif
+    %endif
 %else
-CrossOpts=""
+    CrossOpts=""
 %endif
 
 %if %{with xen}
 CrossOpts="ARCH=xen"
-%define _main_target_base_arch i386
-%define _target_base_arch xen
+%define _main_target_base_arch	i386
+%define _target_base_arch	xen
 %endif
 
 BuildConfig() {
@@ -911,11 +917,24 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 umask 022
+
 %if "%{_target_base_arch}" != "%{_arch}"
-CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
-export DEPMOD=/bin/true
+    CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
+    export DEPMOD=/bin/true
+    %if "%{_arch}" == "x86_64"
+	%if "%{_target_base_arch}" == "i386"
+	    CrossOpts="ARCH=%{_target_base_arch}"
+	    unset DEPMOD
+	%endif
+    %endif
 %else
-CrossOpts=""
+    CrossOpts=""
+%endif
+
+%if %{with xen}
+CrossOpts="ARCH=xen"
+%define _main_target_base_arch	i386
+%define _target_base_arch	xen
 %endif
 
 install -d $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}
@@ -1344,6 +1363,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1131  2005/06/24 15:23:28  pluto
+- x86-64 has biarch compiler, so we don't need to use a cross compiler.
+
 Revision 1.441.2.1130  2005/06/24 12:46:35  cieciwa
 - updated
 
================================================================

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