summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-kernel/linux-headers/ChangeLog7
-rw-r--r--sys-kernel/linux-headers/files/2.6.11-s390-cflags-update.patch13
-rw-r--r--sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild5
-rw-r--r--sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild5
4 files changed, 25 insertions, 5 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/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