diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libx86/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libx86/files/libx86-0.99-ifmask.patch | 21 | ||||
| -rw-r--r-- | dev-libs/libx86/libx86-0.99.ebuild | 4 | ||||
| -rw-r--r-- | dev-libs/libx86/libx86-1.1.ebuild | 11 |
4 files changed, 39 insertions, 4 deletions
diff --git a/dev-libs/libx86/ChangeLog b/dev-libs/libx86/ChangeLog index ac2d5387315d..750f76531a29 100644 --- a/dev-libs/libx86/ChangeLog +++ b/dev-libs/libx86/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libx86 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.8 2008/09/06 13:03:19 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.9 2008/09/06 20:44:56 ulm Exp $ + + 06 Sep 2008; Ulrich Mueller <ulm@gentoo.org> + +files/libx86-0.99-ifmask.patch, libx86-0.99.ebuild, libx86-1.1.ebuild: + Fix compile failure with linux-headers-2.6.26, bug 235599. Thanks to + junki.gnu@gmail.com for the patch. *libx86-1.1 (06 Sep 2008) diff --git a/dev-libs/libx86/files/libx86-0.99-ifmask.patch b/dev-libs/libx86/files/libx86-0.99-ifmask.patch new file mode 100644 index 000000000000..c99eeb819f72 --- /dev/null +++ b/dev-libs/libx86/files/libx86-0.99-ifmask.patch @@ -0,0 +1,21 @@ +--- lrmi.c.orig 2008-09-06 12:24:36.070136428 +0200 ++++ lrmi.c 2008-09-06 12:28:10.584287458 +0200 +@@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE. + #include "x86-common.h" + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#endif ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++#ifndef VIF_MASK ++#define VIF_MASK X86_EFLAGS_VIF ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) diff --git a/dev-libs/libx86/libx86-0.99.ebuild b/dev-libs/libx86/libx86-0.99.ebuild index 37e947372602..bc690ee4797a 100644 --- a/dev-libs/libx86/libx86-0.99.ebuild +++ b/dev-libs/libx86/libx86-0.99.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-0.99.ebuild,v 1.5 2008/08/07 21:54:46 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-0.99.ebuild,v 1.6 2008/09/06 20:44:56 ulm Exp $ inherit eutils multilib @@ -20,6 +20,8 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-build.patch + # fix compile failure with linux-headers-2.6.26, bug 235599 + epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch } src_compile() { diff --git a/dev-libs/libx86/libx86-1.1.ebuild b/dev-libs/libx86/libx86-1.1.ebuild index 1c81d56e8833..d66fa79a173a 100644 --- a/dev-libs/libx86/libx86-1.1.ebuild +++ b/dev-libs/libx86/libx86-1.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-1.1.ebuild,v 1.1 2008/09/06 13:03:19 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-1.1.ebuild,v 1.2 2008/09/06 20:44:56 ulm Exp $ -inherit multilib +inherit eutils multilib DESCRIPTION="A hardware-independent library for executing real-mode x86 code" HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86" @@ -13,6 +13,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +src_unpack() { + unpack ${A} + cd "${S}" + # fix compile failure with linux-headers-2.6.26, bug 235599 + epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch +} + src_compile() { local ARGS if use amd64; then |