r3246 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

[Sven Luther]

Author: luther
Date: 2005-05-27 14:32:58 +0000 (Fri, 27 May 2005)
New Revision: 3246

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-ppc64-biarch-override.patch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-6
Log:
Fixed ppc64 biarch compilation when specifying a command line CC override.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-05-27 07:21:57 UTC (rev 3245)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-05-27 14:32:58 UTC (rev 3246)
@@ -16,8 +16,11 @@
     Allows the new megaraid driver to be enabled without
     disabling the old megaraid driver.
     (Simon Horman)
+  * Fixed FTBFS when using a powerpc biarch compiler, and specifying a command
+    line CC override, which killed the -m64 arcgument needed for ppc64.
+    (Sven Luther)
 
- -- Simon Horman <horms@debian.org>  Fri, 27 May 2005 15:52:22 +0900
+ -- Sven Luther <luther@debian.org>  Fri, 27 May 2005 15:48:45 +0200
 
 kernel-source-2.6.11 (2.6.11-5) unstable; urgency=low
 

Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-ppc64-biarch-override.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-ppc64-biarch-override.patch	2005-05-27 07:21:57 UTC (rev 3245)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-ppc64-biarch-override.patch	2005-05-27 14:32:58 UTC (rev 3246)
@@ -0,0 +1,24 @@
+#! /bin/sh -e 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Works around using a biarch compiler and overriding CC on
+## DP: Description: command line, previously this lost the -m64 flag.
+## DP: Patch author: luther@debian.org
+## DP: Upstream status: FTBFS fix, guess it will be fixed upstream too
+
+
+--- linux-2.6.11/arch/ppc64/Makefile.orig	2005-05-27 13:24:25.000000000 +0000
++++ linux-2.6.11/arch/ppc64/Makefile	2005-05-27 13:24:36.000000000 +0000
+@@ -17,9 +17,9 @@
+ 
+ HAS_BIARCH      := $(call cc-option-yn, -m64)
+ ifeq ($(HAS_BIARCH),y)
+-AS              := $(AS) -a64
+-LD              := $(LD) -m elf64ppc
+-CC		:= $(CC) -m64
++override AS	+= -a64
++override LD	+= -m elf64ppc
++override CC	+= -m64
+ endif
+ 
+ new_nm := $(shell if $(NM) --help 2>&1 | grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-6	2005-05-27 07:21:57 UTC (rev 3245)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-6	2005-05-27 14:32:58 UTC (rev 3246)
@@ -1 +1,2 @@
 + drivers-scsi-megaraid_splitup.patch
++ powerpc-ppc64-biarch-override.patch