Fix compile failure with linux-headers-2.6.26, bug 235599.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

5 files changed, 47 insertions, 11 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/Manifest b/dev-libs/libx86/Manifest
index 90436d6411f4..44032a892d42 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX libx86-0.99-build.patch 958 RMD160 f952be3ff8eaf85381bd08a8651d754af36fa5eb SHA1 dea293e7faac65f66381c42702f5ef34ca82d95d SHA256 3371e4309be8d5627d1f54257c4b06db3856a9c6c1d1d975d89a1d7564275ec2
+AUX libx86-0.99-ifmask.patch 584 RMD160 38fdece655d2fc25adca01fa2399d45d29abf1f6 SHA1 bd03f2b7112bc46bca539d9c948fae3cb90d9041 SHA256 b8070e57c5d267b3736b133e4c3c92965cc5a62e72466b705b506ad2ce39dd25
 DIST libx86-0.99.tar.gz 100534 RMD160 099b4a24842dde578078108ddc7e431402e31727 SHA1 53e44a87dc57a17b2f54fec57d636f577d3c75c1 SHA256 fdaac661dab2845beb5546e43e71ee02d9bf3c04bc623b64e0b124f1da26f546
 DIST libx86-1.1.tar.gz 87428 RMD160 8a8c96e9cbe2a73d0a565f086cff231a64dd8ab6 SHA1 c55d8a428ab7f2084010c255aa8c666602544af9 SHA256 5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
-EBUILD libx86-0.99.ebuild 780 RMD160 0158224baf1c932432044663d22bd722f3a8b2da SHA1 ed22156b006af649705baf8042e3cadaf053f797 SHA256 b6367e77455d8efa5fbc913362214c41394075afed88b7cc01a8219c6aa3f8b4
-EBUILD libx86-1.1.ebuild 675 RMD160 428ad1d1a71ff1acfa56a6a7ccd900dbcb60610f SHA1 758ee70f9170777549a70486f9eb34dc95e7e55f SHA256 971821e63dd2f2bb30eb6b47ea69ae92fb6b80d13ae0df7438e1d326ce17584e
-MISC ChangeLog 1280 RMD160 9dc678f6e9c8f498e0bb4d861723f2585bc5d1b4 SHA1 24b5eafd88ee7a64ad4ce8924158f1fa945c1e6e SHA256 d8acab23bef17b2f54651e5a723501a28f7c90f10df4a6214e2a81d2b3eb045d
+EBUILD libx86-0.99.ebuild 884 RMD160 17480e51237790999c1f808f06399d400414c922 SHA1 8be78ab72e1bb2c15cd48520ab932a573b79f895 SHA256 bd2e77eefbf0377914465e3d9b531acfa32568115706455b6557f1c30ad5cd26
+EBUILD libx86-1.1.ebuild 823 RMD160 cc7545408a40e9609e8f97297b7d58773da77d4a SHA1 e7ff2f34b51db805ec51b0356789aea5e6ec872e SHA256 3794a7532a8fe118bf74393fd69abb7a5da1c84fc13f2cb906aa83dd098b2ec0
+MISC ChangeLog 1502 RMD160 e4033638680b44ce38621ad06423fb91818b67b5 SHA1 be9b7609f59943d3d5a5b6615976efedc3650d5a SHA256 6cd523dfc6dc872ccf6237a274cfc5829b5281782aeeb1a86fadf8bf413d9c73
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkjCg1cACgkQF6yMcaBxwHmUjwCgs6D/5h83VPyIMlTICzA5/rEw
-lVAAoKvmSNr0L+05pxPZKEvzLKhwzcI5
-=Lz69
+iEYEARECAAYFAkjC684ACgkQOeoy/oIi7uykQgCgsShBwO747URdjHmwDvr4Y13/
+FfoAoJId8fJ9OntgtpWlP8LLdqNA0qdq
+=Pd9K
 -----END PGP SIGNATURE-----
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