Disable intel build on arm as it fails

(Portage version: 2.1.6.13/cvs/Linux ia64)

4 files changed, 18 insertions, 8 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 1c5f91fe125c..fe588c8db74d 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libdrm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.98 2009/12/27 18:19:06 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.99 2010/01/12 21:10:10 armin76 Exp $
+
+  12 Jan 2010; Raúl Porcel <armin76@gentoo.org> libdrm-2.4.15.ebuild,
+  libdrm-2.4.16.ebuild, libdrm-2.4.17.ebuild:
+  Disable intel build on arm as it fails
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> libdrm-2.4.15.ebuild:
   Marked ppc stable for bug #294958.
diff --git a/x11-libs/libdrm/libdrm-2.4.15.ebuild b/x11-libs/libdrm/libdrm-2.4.15.ebuild
index d7ab47d4f68c..e23f1bb98254 100644
--- a/x11-libs/libdrm/libdrm-2.4.15.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.15.ebuild,v 1.6 2009/12/27 18:19:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.15.ebuild,v 1.7 2010/01/12 21:10:10 armin76 Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -25,6 +25,8 @@ RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
 CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
+# Fails to build on ARM if dev-libs/libatomic_ops is installed
+use arm && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-intel"
 
 PATCHES=(
 "${FILESDIR}/2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch"
diff --git a/x11-libs/libdrm/libdrm-2.4.16.ebuild b/x11-libs/libdrm/libdrm-2.4.16.ebuild
index 5ef7efe55f7d..f781393766ca 100644
--- a/x11-libs/libdrm/libdrm-2.4.16.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.16.ebuild,v 1.1 2009/12/13 21:06:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.16.ebuild,v 1.2 2010/01/12 21:10:10 armin76 Exp $
 
 inherit x-modular
 
@@ -22,6 +22,8 @@ RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
 CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
+# Fails to build on ARM if dev-libs/libatomic_ops is installed
+use arm && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-intel"
 
 pkg_postinst() {
 	x-modular_pkg_postinst
diff --git a/x11-libs/libdrm/libdrm-2.4.17.ebuild b/x11-libs/libdrm/libdrm-2.4.17.ebuild
index 662a092b5ec9..4bda7ea0c1c3 100644
--- a/x11-libs/libdrm/libdrm-2.4.17.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.17.ebuild,v 1.1 2009/12/21 09:31:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.17.ebuild,v 1.2 2010/01/12 21:10:10 armin76 Exp $
 
 inherit x-modular
 
@@ -22,6 +22,8 @@ RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
 CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
+# Fails to build on ARM if dev-libs/libatomic_ops is installed
+use arm && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-intel"
 
 pkg_postinst() {
 	x-modular_pkg_postinst