summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-11-07 15:49:33 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-11-07 15:49:33 +0000
commitc1d4e2092e2314c71831ecdf3b649d030f99e28c (patch)
tree34e0e43110839443c1f6295d8e70d5e1716ddb3d /sys-kernel
parentVersion bumped. (Manifest recommit) (diff)
downloadgentoo-2-c1d4e2092e2314c71831ecdf3b649d030f99e28c.tar.gz
gentoo-2-c1d4e2092e2314c71831ecdf3b649d030f99e28c.tar.bz2
gentoo-2-c1d4e2092e2314c71831ecdf3b649d030f99e28c.zip
Fix for XOrg for IA64; bug #63478.
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/linux26-headers/ChangeLog6
-rw-r--r--sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch24
-rw-r--r--sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild3
3 files changed, 31 insertions, 2 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index bc7c6acada26..586895c65ef8 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/linux26-headers
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.33 2004/10/27 03:03:01 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.34 2004/11/07 15:49:33 plasmaroo Exp $
+
+ 07 Nov 2004; <plasmaroo@gentoo.org> linux26-headers-2.6.8.1-r1.ebuild,
+ files/linux26-headers-2.6.8.1-appCompat.patch:
+ Fix for XOrg for IA64; bug #63478.
26 Oct 2004; Tom Gall <tgall@gentoo.org> linux26-headers-2.6.8.1-r1.ebuild:
stable on ppc64, used for 2004.3
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch
index 2444d2a8f811..87e33b1cb6e7 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch
@@ -1671,3 +1671,27 @@ diff -ur linux-2.6.8.1/include/asm-sparc/signal.h linux-2.6.8.1-gentoo/include/a
typedef struct {
unsigned long sig[_NSIG_WORDS];
+diff -ur linux-2.6.8.1/include/asm-ia64/fpu.h linux-2.6.8.1-gentoo/include/asm-ia64/fpu.h
+--- linux-2.6.8.1/include/asm-ia64/fpu.h 2004-10-31 14:20:01.000000000 -0700
++++ linux-2.6.8.1-gentoo/include/asm-ia64/fpu.h 2004-11-01 12:04:54.202369190 -0700
+@@ -53,13 +53,20 @@
+ | FPSR_S3 (FPSF_DEFAULT | FPSF_TD))
+
+ # ifndef __ASSEMBLY__
++# ifndef __KERNEL__
++# include <dlfcn.h>
++ /* Versioning, newer glibc's declare ia64_fpreg without telling us
++ -- plasmaroo */
++# endif
+
++# if !defined(RTLD_DEEPBIND) || !defined(_BITS_SIGCONTEXT_H) || defined(__KERNEL__)
+ struct ia64_fpreg {
+ union {
+ unsigned long bits[2];
+ long double __dummy; /* force 16-byte alignment */
+ } u;
+ };
++# endif
+
+ # endif /* __ASSEMBLY__ */
+
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
index 17e6d2124b54..28917ae457e6 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.5 2004/10/31 04:17:00 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.6 2004/11/07 15:49:33 plasmaroo Exp $
ETYPE="headers"
inherit kernel eutils
@@ -62,6 +62,7 @@ src_unpack() {
# Fixes
case "${ARCH}" in
*)
+ headers___fix ${S}/include/asm-ia64/*
headers___fix ${S}/include/asm-ppc64/*
headers___fix ${S}/include/asm-ppc64/iSeries/*
;;