diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2008-08-23 12:44:26 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2008-08-23 12:44:26 +0000 |
| commit | 2412c68698ebf23693ad97cc3ed526bff7015427 (patch) | |
| tree | 70f783281ac038e1c324befc78cea55b12811c0e /sys-libs/lrmi | |
| parent | Bump to add pkg_postrm (#235502) and register XML::LibXML::SAX too (diff) | |
| download | gentoo-2-2412c68698ebf23693ad97cc3ed526bff7015427.tar.gz gentoo-2-2412c68698ebf23693ad97cc3ed526bff7015427.tar.bz2 gentoo-2-2412c68698ebf23693ad97cc3ed526bff7015427.zip | |
Fix bug #235495.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26 x86_64)
Diffstat (limited to 'sys-libs/lrmi')
| -rw-r--r-- | sys-libs/lrmi/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch | 18 | ||||
| -rw-r--r-- | sys-libs/lrmi/lrmi-0.10-r1.ebuild | 12 |
3 files changed, 34 insertions, 4 deletions
diff --git a/sys-libs/lrmi/ChangeLog b/sys-libs/lrmi/ChangeLog index ed0ca94a8bc5..324a5d2cbd88 100644 --- a/sys-libs/lrmi/ChangeLog +++ b/sys-libs/lrmi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/lrmi -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.17 2007/04/10 09:14:47 spock Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.18 2008/08/23 12:44:25 spock Exp $ + + 23 Aug 2008; Michał Januszewski <spock@gentoo.org> + +files/lrmi-0.10-kernel-2.6.26.patch, lrmi-0.10-r1.ebuild: + Fix bug #235495. 10 Apr 2007; Michał Januszewski <spock@gentoo.org> metadata.xml: Add myself as maintainer. diff --git a/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch new file mode 100644 index 000000000000..9547439376a3 --- /dev/null +++ b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch @@ -0,0 +1,18 @@ +diff -Naurp lrmi-0.10-orig/lrmi.c lrmi-0.10/lrmi.c +--- lrmi-0.10-orig/lrmi.c 2008-08-23 14:39:44.000000000 +0200 ++++ lrmi-0.10/lrmi.c 2008-08-23 14:40:25.000000000 +0200 +@@ -61,6 +61,14 @@ OTHER DEALINGS IN THE SOFTWARE. + + #include "lrmi.h" + ++/* 2.6.26+ kernels don't define the legacy masks. */ ++#if defined(__linux__) && !defined(TF_MASK) ++ #define TF_MASK X86_EFLAGS_TF ++ #define IF_MASK X86_EFLAGS_IF ++ #define VIF_MASK X86_EFLAGS_VIF ++ #define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++ + #define REAL_MEM_BASE ((void *)0x10000) + #define REAL_MEM_SIZE 0x40000 + #define REAL_MEM_BLOCKS 0x100 diff --git a/sys-libs/lrmi/lrmi-0.10-r1.ebuild b/sys-libs/lrmi/lrmi-0.10-r1.ebuild index a576207fe675..b22f75160007 100644 --- a/sys-libs/lrmi/lrmi-0.10-r1.ebuild +++ b/sys-libs/lrmi/lrmi-0.10-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.1 2006/02/14 00:25:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.2 2008/08/23 12:44:25 spock Exp $ + +inherit eutils DESCRIPTION="library for calling real mode BIOS routines under Linux" HOMEPAGE="http://www.sourceforge.net/projects/lrmi/" @@ -14,6 +16,12 @@ IUSE="" DEPEND="" RDEPEND="" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/lrmi-0.10-kernel-2.6.26.patch +} + src_compile() { emake CFLAGS="${CFLAGS}" || die } |