Minor fix for s390/gcc-4 from upstream.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 33 insertions, 12 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index b56822b9f174..68b8a6643d9b 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.161 2006/01/05 19:11:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.162 2006/01/07 03:49:55 vapier Exp $
+
+  07 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/2.6.11-s390-cflags-update.patch, linux-headers-2.6.11-r2.ebuild,
+  linux-headers-2.6.11-r3.ebuild:
+  Minor fix for s390/gcc-4 from upstream.
 
   05 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   linux-headers-2.6.11-r4.ebuild:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 4233af5ebe09..03d00d6523ea 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1bdec6627714bc62210698f31c9bddb9 ChangeLog 31467
+MD5 f5b15ea8945529ac234c007381faeefe ChangeLog 31666
 MD5 e32b5df37d1bd1fde32f19276f8bc5e2 files/2.6.11-ppc64-32ul-spinlock.patch 510
+MD5 505d7b7cd4ace73dbd5473c7fd3cdf37 files/2.6.11-s390-cflags-update.patch 391
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
@@ -38,16 +39,16 @@ MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
 MD5 7a20e26b7cddf8179591f77334b5641c linux-headers-2.4.25.ebuild 3410
 MD5 df0fbc123a44ae70a18a60b02d522cbb linux-headers-2.4.26-r1.ebuild 775
 MD5 6a3b45eded92aace1a5df1a478fa977b linux-headers-2.4.26.ebuild 3340
-MD5 6cf8a3d5b351f3a78641e8cd3979ffff linux-headers-2.6.11-r2.ebuild 1694
-MD5 127b7a3b01cad94b0c3d581bd11a3bc8 linux-headers-2.6.11-r3.ebuild 1789
+MD5 0831e2e23b7f7f5361f5bd7a130dd6a3 linux-headers-2.6.11-r2.ebuild 1748
+MD5 1bb0bd04ebf505649e461439862a02bd linux-headers-2.6.11-r3.ebuild 1840
 MD5 4b63c0075bb42c8937f4c97d07a47ef2 linux-headers-2.6.11-r4.ebuild 1840
 MD5 34394494a84bca539fea305c5470cddd linux-headers-2.6.15_rc6.ebuild 1681
 MD5 4b7f9dd73295707d019c97d76b76a021 linux-headers-2.6.8.1-r4.ebuild 1213
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDvW9eKRy60XGEcJIRAjefAJ9XTn9u9FanPTXaIKCEFqLQB8eP3QCfSQYL
-gTEJ8Qtp4TWL53Nn8MRnXfU=
-=6yRg
+iD8DBQFDvzqs2+ySkm8kpY0RAhIiAJ9cQSe5/qZZfkQn8IoPTArdmRyDYgCgo3i0
+DgwDr+p2DWF3imXdhsBfKzo=
+=KEbb
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/files/2.6.11-s390-cflags-update.patch b/sys-kernel/linux-headers/files/2.6.11-s390-cflags-update.patch
new file mode 100644
index 000000000000..07018218aef8
--- /dev/null
+++ b/sys-kernel/linux-headers/files/2.6.11-s390-cflags-update.patch
@@ -0,0 +1,13 @@
+Fix from newer kernels
+
+--- arch/s390/Makefile
++++ arch/s390/Makefile
+@@ -66,7 +66,7 @@
+ cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE)
+ endif
+ 
+-CFLAGS		+= -mbackchain $(cflags-y)
++CFLAGS		+= -mbackchain -msoft-float $(cflags-y)
+ CFLAGS		+= $(call cc-option,-finline-limit=10000)
+ CFLAGS 		+= -pipe -fno-strength-reduce -Wno-sign-compare 
+ AFLAGS		+= $(aflags-y)
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
index feef81a3ae53..97b8a21383e0 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.21 2005/11/28 21:17:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.22 2006/01/07 03:49:55 vapier Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
@@ -20,6 +20,7 @@ UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2"
 
 src_unpack() {
 	kernel-2_src_unpack
+	epatch "${FILESDIR}"/2.6.11-s390-cflags-update.patch
 
 	# This should always be used but it has a bunch of hunks which
 	# apply to include/linux/ which i'm unsure of so only use with
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild
index b7c2bf11a654..34760c0afedf 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild,v 1.2 2005/12/19 21:18:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild,v 1.3 2006/01/07 03:49:55 vapier Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
@@ -20,6 +20,7 @@ UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2"
 
 src_unpack() {
 	kernel-2_src_unpack
+	epatch "${FILESDIR}"/2.6.11-s390-cflags-update.patch
 
 	# This should always be used but it has a bunch of hunks which
 	# apply to include/linux/ which i'm unsure of so only use with