Fix compilation on ppc, bug #394183

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 58 insertions, 9 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index b7564b36b6fa..5c415190554e 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.60 2012/01/27 13:42:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.61 2012/01/27 15:21:41 voyageur Exp $
+
+  27 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0.ebuild,
+  +files/llvm-3.0-PPC_macro.patch:
+  Fix compilation on ppc, bug #394183
 
   27 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
   Really fix new llvm-config in live ebuild, bug #392715
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 7b258a5bd05e..173f8a13cd4d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -7,20 +7,21 @@ AUX llvm-2.8-alignof.patch 2522 RMD160 6a359ba15b1943929541c5e7bbd6a2a6480e85bc
 AUX llvm-2.8-darwin8.patch 576 RMD160 ed1d9c8d9eda3fecf55b7848eee76cdd92a59a13 SHA1 60d0772513d66e7a79d70f0a98f03c67ab1d1d0f SHA256 6db04d9bb5fe65f8a92972988477328a7358e325abca32f30a716ff454d0fe21
 AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443a15e6a7c SHA1 8bc7357b793cb5cc83e54f056d54d311ec93853d SHA256 1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7
 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84
+AUX llvm-3.0-PPC_macro.patch 1825 RMD160 d991c5c8c05cdc6e4ce6bf4b43059f54822d69b8 SHA1 11a5439873ed00152f2ee2635313aec22ec58452 SHA256 e56947d9744549ef6903238653c6569b5f91a1eb1bd84ec5d69d32ce5b20d6e4
 AUX llvm-3.0-ocaml_install.patch 664 RMD160 c439931f952e7e053b726435ae0a8e502ebe5080 SHA1 15c8a81baa0e6e78d734f5451b319bf6d896eb2a SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SHA1 b683e7294fcf69887c0d709025d4640f5dca755b SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
 EBUILD llvm-2.9-r2.ebuild 6179 RMD160 47fd4981eb19d1abd644f6a4b268b04f04b1a77c SHA1 03be220126b66435115c9b90606728aca9eebf25 SHA256 3118e5514d5f0adf026e8bab1dd6b13c07702480dd1b475c6861c0696c0f2dd9
-EBUILD llvm-3.0.ebuild 5415 RMD160 a4fbe633b4a7e9d3a9f6cbeeba45d7508277bf4e SHA1 1fd486dcdb570b51f9d8e41b45dc9f6b30b61230 SHA256 c7310eea7486e7ef9f2f19c7b29c4c552ebd6c444d65f94aa7973d458f69bb8d
+EBUILD llvm-3.0.ebuild 5469 RMD160 8a6ded6a0f2efa3a386bcff0e54d33d158fbe9f2 SHA1 21d69ad3796f4c4657d2d7b1a0ddba222589714e SHA256 91678be32a0bd24cf1531f537f7a9ebcb05d534e39d2ad9c6ca25748a5f54cce
 EBUILD llvm-9999.ebuild 5324 RMD160 13c095eaf87c38dd5e6c060036d4bb0071450724 SHA1 e6037858add9d4e644071143091e313daa9d4f71 SHA256 8f63c65d793a4d0574a85015fa262210da1ccdec90e0e45d6b3cf085b2772335
-MISC ChangeLog 10042 RMD160 12be0804062d237ba3b837ee12d9fbe7096718a9 SHA1 134b68ed36bb58a3bfa5347abfd1e84644c9c616 SHA256 ec2e47108d608f877b52335608e72feb89f41bc8e4ac6d00bda607c83d53a56a
+MISC ChangeLog 10188 RMD160 33808da0eef323cc9ceb68f9bed5385775937a7a SHA1 20a83338cb0d64c12be8740886b8074074c3927a SHA256 274e91976c2d045d63b9e734e427a7752291771dac95f4a5f9399b76f63fe2d5
 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8iqcUACgkQFYEBGcdFJfLk4wEAhSVPsKwJbN0U3FFhwAUhbN0l
-C5c4bhmlnbtX07+/x0YA/ijxml/vD2byQ+iEVAavIeRkOojCLD/+rl5KQzmg057p
-=djQO
+iF4EAREIAAYFAk8iwRAACgkQFYEBGcdFJfKsswEAoXFJ8bAkj3L9W/GyX9eLF8Qa
+CZVGGNC12xajsaP4qWIA/2fZVd83SfythGALxCDZOpPeffR+8EY1So1oVHqIGtTl
+=g1V/
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch b/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch
new file mode 100644
index 000000000000..c485e9ba6847
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch
@@ -0,0 +1,43 @@
+Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h
+===================================================================
+--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h	2011-07-25 23:24:55.000000000 +0000
++++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h	2011-12-02 13:06:48.000000000 +0000
+@@ -34,6 +34,10 @@
+   
+ } // End llvm namespace
+ 
++// Generated files will use "namespace PPC". To avoid symbol clash,
++// undefine PPC here. PPC may be predefined on some hosts.
++#undef PPC
++
+ // Defines symbolic names for PowerPC registers.  This defines a mapping from
+ // register name to register number.
+ //
+Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h
+===================================================================
+--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h	2011-07-26 00:24:13.000000000 +0000
++++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h	2011-12-02 13:06:48.000000000 +0000
+@@ -14,6 +14,10 @@
+ #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H
+ #define LLVM_TARGET_POWERPC_PPCPREDICATES_H
+ 
++// Generated files will use "namespace PPC". To avoid symbol clash,
++// undefine PPC here. PPC may be predefined on some hosts.
++#undef PPC
++
+ namespace llvm {
+ namespace PPC {
+   /// Predicate - These are "(BI << 5) | BO"  for various predicates.
+Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
+===================================================================
+--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h	2011-07-25 19:53:23.000000000 +0000
++++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h	2011-12-02 16:21:23.000000000 +0000
+@@ -12,6 +12,8 @@
+ 
+ #include "llvm/MC/MCFixup.h"
+ 
++#undef PPC
++
+ namespace llvm {
+ namespace PPC {
+ enum Fixups {
diff --git a/sys-devel/llvm/llvm-3.0.ebuild b/sys-devel/llvm/llvm-3.0.ebuild
index ef8c7a7fb7a6..aa2f9ab5443c 100644
--- a/sys-devel/llvm/llvm-3.0.ebuild
+++ b/sys-devel/llvm/llvm-3.0.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/sys-devel/llvm/llvm-3.0.ebuild,v 1.3 2011/12/12 18:23:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0.ebuild,v 1.4 2012/01/27 15:21:41 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
@@ -89,6 +89,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
 	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
 	epatch "${FILESDIR}"/${P}-ocaml_install.patch
+	epatch "${FILESDIR}"/${P}-PPC_macro.patch
 }
 
 src_configure() {