summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavoz@gentoo.org>2006-10-23 15:19:25 +0000
committerGustavo Zacarias <gustavoz@gentoo.org>2006-10-23 15:19:25 +0000
commitd165da16a6157e10b3baee9b6831ba28b252781e (patch)
tree5bc1644a22933e05ca338c799d3a289eba1cc532 /sys-apps
parentStable on sparc wrt #136665 (diff)
downloadgentoo-2-d165da16a6157e10b3baee9b6831ba28b252781e.tar.gz
gentoo-2-d165da16a6157e10b3baee9b6831ba28b252781e.tar.bz2
gentoo-2-d165da16a6157e10b3baee9b6831ba28b252781e.zip
Build fix: sparc newer linux-headers lack asm/kbio
(Portage version: 2.1.1)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/kbd/ChangeLog6
-rw-r--r--sys-apps/kbd/files/kbd-1.12-kbio.patch25
-rw-r--r--sys-apps/kbd/kbd-1.12-r8.ebuild5
3 files changed, 34 insertions, 2 deletions
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index d2b564f9868d..e99fef71a28e 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/kbd
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.53 2006/10/14 20:29:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.54 2006/10/23 15:19:25 gustavoz Exp $
+
+ 23 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+ +files/kbd-1.12-kbio.patch, kbd-1.12-r8.ebuild:
+ Build fix: sparc newer linux-headers lack asm/kbio
14 Oct 2006; Aron Griffis <agriffis@gentoo.org> kbd-1.12-r7.ebuild:
Mark 1.12-r7 stable on ia64
diff --git a/sys-apps/kbd/files/kbd-1.12-kbio.patch b/sys-apps/kbd/files/kbd-1.12-kbio.patch
new file mode 100644
index 000000000000..b2a80d9a3437
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-kbio.patch
@@ -0,0 +1,25 @@
+diff -Nura kbd-1.12/src/kbdrate.c kbd-1.12.nokbio/src/kbdrate.c
+--- kbd-1.12/src/kbdrate.c 2004-01-16 16:45:31.000000000 -0300
++++ kbd-1.12.nokbio/src/kbdrate.c 2006-10-23 11:30:11.000000000 -0300
+@@ -77,7 +77,6 @@
+
+ #ifdef __sparc__
+ #include <asm/param.h>
+-#include <asm/kbio.h>
+ #endif
+
+ #ifndef KDKBDREP
+diff -Nura kbd-1.12/src/setleds.c kbd-1.12.nokbio/src/setleds.c
+--- kbd-1.12/src/setleds.c 2004-01-16 16:45:31.000000000 -0300
++++ kbd-1.12.nokbio/src/setleds.c 2006-10-23 11:30:20.000000000 -0300
+@@ -14,10 +14,6 @@
+ #include "nls.h"
+ #include "version.h"
+
+-#ifdef __sparc__
+-#include <asm/kbio.h>
+-#endif
+-
+ static void
+ usage(void)
+ {
diff --git a/sys-apps/kbd/kbd-1.12-r8.ebuild b/sys-apps/kbd/kbd-1.12-r8.ebuild
index 7ca69f3a8e51..10a13c592b18 100644
--- a/sys-apps/kbd/kbd-1.12-r8.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r8.ebuild,v 1.1 2006/08/24 13:57:25 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r8.ebuild,v 1.2 2006/10/23 15:19:25 gustavoz Exp $
inherit eutils toolchain-funcs
@@ -76,6 +76,9 @@ src_unpack() {
# cross-compile fails for powerpc targets bug #133856
epatch "${FILESDIR}"/${P}-xcompile.patch
+
+ # sparc newer headers lack asm/kbio.h
+ epatch "${FILESDIR}"/${P}-kbio.patch
}
src_compile() {