[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Fixes for build failures on sparc



Hi,

xorg-xserver 1.0.2-8.1 failed to build on sparc buildd because neither the new kernel, nor the updated version of linux-kernel-headers does not include the asm/kbio.h header file anymore. This file is included in a couple of places on sparc only, and it looks like it's not really neccessary. I've tried rebuilding the packages without including this header in two locations (see attached patch), and it built fine and works without any noticeable effects. The code in question is only relevant for sparc (protected by ifdefs), please apply.

Best regards,

Jurij Smakov                                        jurij@wooyd.org
Key: http://www.wooyd.org/pgpkey/                   KeyID: C99E03CC
diff -aur a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c
--- a/hw/xfree86/os-support/linux/lnx_io.c	2005-08-26 00:24:21.000000000 -0700
+++ b/hw/xfree86/os-support/linux/lnx_io.c	2006-07-01 20:01:26.000000000 -0700
@@ -74,7 +74,6 @@
 #include <linux/version.h>
 #ifdef __sparc__
 #include <asm/param.h>
-#include <asm/kbio.h>
 #endif
 
 /* Deal with spurious kernel header change in struct kbd_repeat.
diff -aur a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c
--- a/hw/xfree86/os-support/linux/lnx_kbd.c	2005-08-26 00:24:21.000000000 -0700
+++ b/hw/xfree86/os-support/linux/lnx_kbd.c	2006-07-01 20:01:40.000000000 -0700
@@ -104,7 +104,6 @@
 #include <linux/version.h>
 #ifdef __sparc__
 #include <asm/param.h>
-#include <asm/kbio.h>
 #endif
 
 /* Deal with spurious kernel header change in struct kbd_repeat.

Reply to: