diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-01-21 20:21:11 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-01-21 20:21:11 +0000 |
| commit | 46226fb0fb7aac2a64dfc26c6b687819096bb8d6 (patch) | |
| tree | d6ba26f839dfb4bd58c64c56a33595077513912c /app-emulation/kqemu | |
| parent | Initial commit (as part of #356535 by Satoshi Hayazaki) (diff) | |
| download | gentoo-2-46226fb0fb7aac2a64dfc26c6b687819096bb8d6.tar.gz gentoo-2-46226fb0fb7aac2a64dfc26c6b687819096bb8d6.tar.bz2 gentoo-2-46226fb0fb7aac2a64dfc26c6b687819096bb8d6.zip | |
Fixed build falure against linux-2.6.39+. Bug #368439 by Ian Abbott and patch by Ch E.
(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/kqemu')
| -rw-r--r-- | app-emulation/kqemu/ChangeLog | 9 | ||||
| -rw-r--r-- | app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch | 24 | ||||
| -rw-r--r-- | app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild | 5 |
3 files changed, 34 insertions, 4 deletions
diff --git a/app-emulation/kqemu/ChangeLog b/app-emulation/kqemu/ChangeLog index 626de8a03304..84df726d665f 100644 --- a/app-emulation/kqemu/ChangeLog +++ b/app-emulation/kqemu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/kqemu -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.33 2011/03/24 19:48:14 angelos Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.34 2012/01/21 20:21:11 slyfox Exp $ + + 21 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/kqemu-1.4.0_pre1-remove-smp_lock.patch, kqemu-1.4.0_pre1-r1.ebuild: + Fixed build falure against linux-2.6.39+. Bug #368439 by Ian Abbott and patch + by Ch E. 24 Mar 2011; Christoph Mende <angelos@gentoo.org> kqemu-1.4.0_pre1-r1.ebuild: Stable on amd64 wrt bug #356685 diff --git a/app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch b/app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch new file mode 100644 index 000000000000..d7e7ebebce47 --- /dev/null +++ b/app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch @@ -0,0 +1,24 @@ +With BKL <smp_lock.h> gone away from linux. + +Patch fixes build failure against stable kernel: + CC [M] kqemu-1.4.0pre1/kqemu-linux.o + kqemu-1.4.0pre1/kqemu-linux.c:27:28: error: linux/smp_lock.h: No such file or directory + +Bug-URL: http://bugs.gentoo.org/368439 +Reported-by: Ian Abbott +Patch-by: c.exe@gmx.de + +diff --git a/kqemu-linux.c b/kqemu-linux.c +index f7246f1..c476d28 100644 +--- a/kqemu-linux.c ++++ b/kqemu-linux.c +@@ -24,7 +24,9 @@ + #include <linux/proc_fs.h> + #include <linux/version.h> + #include <linux/ioctl.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) + #include <linux/smp_lock.h> ++#endif + #include <linux/miscdevice.h> + #include <asm/atomic.h> + #include <asm/processor.h> diff --git a/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild b/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild index 4daf70144aba..684a8b45e58f 100644 --- a/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild +++ b/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild,v 1.4 2011/03/24 19:48:14 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild,v 1.5 2012/01/21 20:21:11 slyfox Exp $ inherit eutils flag-o-matic linux-mod toolchain-funcs @@ -42,6 +42,7 @@ src_unpack() { -i common/Makefile epatch "${FILESDIR}/${P}-missing-sched-header.patch" epatch "${FILESDIR}"/${P}-init_MUTEX.patch + epatch "${FILESDIR}"/${P}-remove-smp_lock.patch #368439 } src_compile() { |