Fix building with llvm-3.5 #523232

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64

4 files changed, 151 insertions, 22 deletions

diff --git a/dev-libs/libclc/ChangeLog b/dev-libs/libclc/ChangeLog
index 1162ff0e92f5..7a171c837964 100644
--- a/dev-libs/libclc/ChangeLog
+++ b/dev-libs/libclc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libclc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/ChangeLog,v 1.10 2014/04/06 10:10:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/ChangeLog,v 1.11 2014/10/09 06:30:16 patrick Exp $
+
+*libclc-0.0.1_pre20140101-r1 (09 Oct 2014)
+
+  09 Oct 2014; Patrick Lauer <patrick@gentoo.org>
+  +files/libclc-llvm-3.5-compat.patch, +libclc-0.0.1_pre20140101-r1.ebuild:
+  Fix building with llvm-3.5 #523232
 
   06 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
   libclc-0.0.1_pre20131010.ebuild:
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 6283641ae40c..d2f681f86190 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX libclc-llvm-3.5-compat.patch 2946 SHA256 9e6ace0e9da45b805284b83b0731e1f8bb97a457baecc70036b7848f1b081f3c SHA512 1abf727778e44f3160acf515a40056fcfe2413bf66055bf2b4cf8520abb074a1fd389ffd16a270b48a8fcf5bf4390d0c0dc025ecab00593eabf6a88a85614e7e WHIRLPOOL 9773094683a3fe901c16e32709a41fef289ccb03b11a50ac8faa77bf5c08deece7b13a445495a9dd7ffc1778a35b4470e9a8f091692c97abb9afddf407dbddb6
 DIST libclc-0.0.1_pre20131010.tar.xz 24316 SHA256 6bc84cc2fffd49eeaee361071f7c3038384b901ef3d86daf704eede18baa7743 SHA512 f52bff8cd65ddc48d89c3143d2d5f123cb77fa85bd5891be62168735888b66c90d398f7e3a1c37f4c435a581d87b61a885f1bcc0e8932563700d6206d52ba48d WHIRLPOOL 030d41136a1ef25761971a9b484b6003b06e725b77be24202c223d1b80bc0853a4849e3fa68151aad1d21f3abed8c8c41fe2c9bba2fd2c8e01e9dc430696077c
 DIST libclc-0.0.1_pre20140101.tar.xz 27528 SHA256 990820e918a14b6ef2941ce44e2dca0c6a4025dda8a299af7da8c75bdc40a409 SHA512 460ff4e0c06116000f5f91e35e6118eb117c91b1678473fd25512924e3095693cdd1024db69f9f361c744254df5c2bf8c209096fbad15f48915f3cdd3159ea84 WHIRLPOOL c0753f27925336b45591d2e5d4cda30a685d85629fdcb5dbb8110f59306bed3cdee701c6312ec7da56e1c943a50bdc301d7c59e6b1155bbc1d6da03fb305e0a7
 EBUILD libclc-0.0.1_pre20131010.ebuild 1087 SHA256 0edff9cbc06f1e1ed33a2e9a3b99c40b7ce24bdb031320c0a4929c1f259c31c0 SHA512 53dfd3830be2ddbaaec0d246688d48071903503ea3dbcd06e6447d2f125395aa9ac547cf19532744354a70780fc0dcf5be5899de44f1363a63d5634b06e820a9 WHIRLPOOL e481b1607030dacdb6f17df9b8017185b7cdd1571ae4c6df5d18c0be90e2fb2414c53d64688666c02e6fe94303abf1c47d6e3e4a0c02d205a4a3e87159dfdfe0
+EBUILD libclc-0.0.1_pre20140101-r1.ebuild 1130 SHA256 fd175718fae0d2c5bae764e0611b51d4faa44eee2e230ef8ced238af3c682e38 SHA512 e010a478916422fa63548b9031ec307bae68f43444e64eb81ca509b0af3d7404a6b647393bc401b383ed0feff621d20a38457be464ad86a30309d12f79011d97 WHIRLPOOL ed836944d31b6eaa6001708929047a22da23f63e1871d2bc8cebb0e20982429dae201b99f2bdaed292462d40627c61a6c7841cd220435da8a47b23b2d6dea1f9
 EBUILD libclc-0.0.1_pre20140101.ebuild 1058 SHA256 964e534cfbd8e258b248effe816c918b54d7d174849f59a6012d4a020c3fe580 SHA512 b63f1eb7b845e5c804ffb337c50a151d461e5ec672c64845bcf488fbfa29f0413168eba31d2a614165a67a1a1c8fa651e87b8bb583fad7843b38647f697fd428 WHIRLPOOL f56cb77d2b7b07ee86b39684875d4c84f66a710641a2e398ab9fa4199d63467eb330f994d098f9597874c4673c9ad62aaae1795708169c80fd7cbd004bda177a
-MISC ChangeLog 2035 SHA256 3521167bc12084db1eb87f82dba0c39ff5310b87932e0b1bbd78da75f49f2958 SHA512 b88e19d1e280b57c0bb4ac5a9beb38b2c5076cd3c7311fd1d8d618e50f59217f721b47cdabf2a521615bcb8dbaa8b67e9d7f6418f3015be8b852da81c1079718 WHIRLPOOL fabe9421a659aedc1dac4b1f1ec0dfc4e28633e851dfd9e55d0de24d3f96da6047ef2cd313362e7d3d265a87041312c9c4b307b74327350d98f05d9f5f5361fe
+MISC ChangeLog 2247 SHA256 0d91a34fde88ab1a2a9ef105f32432849495a93522a43d88d1e2e7714f9e4e05 SHA512 b5bac4619427b7161adb3174e6f39bbe53ef775b2761729a897fb2a9f432a255ffc9ca9a395f5f47ac88158df634ab465ddbfa43b8078064680ae773c5ea8617 WHIRLPOOL cb93edf506f49964758a918571d846b9d815b85a1a2dcd7d536147868532fa7a80d6740121c53b7565120cbf355075c965542f2c73cafb24a27dc3f9c5559ec1
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTQSggAAoJELp701BxlEWfhHUP/A1D0lVT/edORlBAIOz3ipLh
-WkXcHGN50m+qEIzHsHd2aqUoaEdH1uauC6e7DkUj0g1k7mNsFFLknFZYDy+18KJ4
-C2WNPZGCr8rGgU51GgHQJfZumW4EEJXDDhix2u/Qjiu3hyvXkNKvGYPmYFpk4xfm
-FhcPEMGBfKoy7VjZOU/QKLE9L9y2whsD6Oe5mdVtqDDw2CHuCOuz/RAPo0wDgsp7
-emcKf+fW/XC+KDgHK9Wil1vFrK/P9s86rplHD3fonUTy0JLlCujayakpsWzHpdrV
-SL2gDPwT46xh9qQkl1j4aroBofZQO8dwSthD6NVnLOGpfMULQg/I1jP6uiLqojVj
-ofWCbldPx6HQVCk6wo5nOuPfLN0e15uMtVaeUP1cfZtZPZbRuZHnvyzWIwd4sRfQ
-QadA9Ls52Qq4YDDShTYHh1pGsnyQY5bFj78qRUYakfetnsmS3e4+PTjYA0s6aH2n
-GzrDJRNVgB647N5Ehek1+D137hxXZVX8auUap4ca8rMW9RM0odJcRyyZZ71HS6NE
-1YVjMTkAEYXWpBmf9x3Zs1bjoxYYujwax49cwkBEl1KCd+tcd3W7EAJI39sAK1ZL
-n6maAzwg1WoUBzxQCnhZg1pVMM5zRVWaAQVJKtjV/YzQMVdsDCAOO/CvzN3WCrw8
-HPrbokFzfg4rX6Mm9Ltt
-=Hd/W
------END PGP SIGNATURE-----
diff --git a/dev-libs/libclc/files/libclc-llvm-3.5-compat.patch b/dev-libs/libclc/files/libclc-llvm-3.5-compat.patch
new file mode 100644
index 000000000000..34b4899e0623
--- /dev/null
+++ b/dev-libs/libclc/files/libclc-llvm-3.5-compat.patch
@@ -0,0 +1,83 @@
+diff -urpN libclc-0.0.1_pre20140101.orig/utils/prepare-builtins.cpp libclc-0.0.1_pre20140101/utils/prepare-builtins.cpp
+--- libclc-0.0.1_pre20140101.orig/utils/prepare-builtins.cpp	2014-09-22 13:08:50.236934929 -0700
++++ libclc-0.0.1_pre20140101/utils/prepare-builtins.cpp	2014-09-22 13:12:43.164665140 -0700
+@@ -1,4 +1,3 @@
+-#include "llvm/ADT/OwningPtr.h"
+ #include "llvm/Bitcode/ReaderWriter.h"
+ #include "llvm/IR/Function.h"
+ #include "llvm/IR/GlobalVariable.h"
+@@ -7,11 +6,28 @@
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/ManagedStatic.h"
+ #include "llvm/Support/MemoryBuffer.h"
++#include "llvm/Support/FileSystem.h"
+ #include "llvm/Support/raw_ostream.h"
+-#include "llvm/Support/system_error.h"
++#include "llvm/Support/ErrorOr.h"
+ #include "llvm/Support/ToolOutputFile.h"
+ #include "llvm/Config/config.h"
+ 
++#define LLVM_350_AND_NEWER \
++  (LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5))
++
++#if LLVM_350_AND_NEWER
++#include <system_error>
++
++#define ERROR_CODE std::error_code
++#define UNIQUE_PTR std::unique_ptr
++#else
++#include "llvm/ADT/OwningPtr.h"
++#include "llvm/Support/system_error.h"
++
++#define ERROR_CODE error_code
++#define UNIQUE_PTR OwningPtr
++#endif
++
+ using namespace llvm;
+ 
+ static cl::opt<std::string>
+@@ -31,11 +47,26 @@ int main(int argc, char **argv) {
+   std::auto_ptr<Module> M;
+ 
+   {
+-    OwningPtr<MemoryBuffer> BufferPtr;
+-    if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr))
++#if LLVM_350_AND_NEWER
++    ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
++      MemoryBuffer::getFile(InputFilename);
++    std::unique_ptr<MemoryBuffer> &BufferPtr = BufferOrErr.get();
++    if (std::error_code  ec = BufferOrErr.getError())
++#else
++    UNIQUE_PTR<MemoryBuffer> BufferPtr;
++    if (ERROR_CODE ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr))
++#endif
+       ErrorMessage = ec.message();
+-    else
++    else {
++#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4)
++      ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(BufferPtr.get(), Context);
++      if (ERROR_CODE ec = ModuleOrErr.getError())
++	ErrorMessage = ec.message();
++      M.reset(ModuleOrErr.get());
++#else
+       M.reset(ParseBitcodeFile(BufferPtr.get(), Context, &ErrorMessage));
++#endif
++    }
+   }
+ 
+   if (M.get() == 0) {
+@@ -65,10 +95,12 @@ int main(int argc, char **argv) {
+   }
+ 
+   std::string ErrorInfo;
+-  OwningPtr<tool_output_file> Out
++  UNIQUE_PTR<tool_output_file> Out
+   (new tool_output_file(OutputFilename.c_str(), ErrorInfo,
+-#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 3)
++#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR == 4)
+                         sys::fs::F_Binary));
++#elif LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5)
++                        sys::fs::F_None));
+ #else
+                         raw_fd_ostream::F_Binary));
+ #endif
diff --git a/dev-libs/libclc/libclc-0.0.1_pre20140101-r1.ebuild b/dev-libs/libclc/libclc-0.0.1_pre20140101-r1.ebuild
new file mode 100644
index 000000000000..0ebdbba50e07
--- /dev/null
+++ b/dev-libs/libclc/libclc-0.0.1_pre20140101-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20140101-r1.ebuild,v 1.1 2014/10/09 06:30:16 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+EGIT_REPO_URI="http://llvm.org/git/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+
+inherit base python-any-r1 $GIT_ECLASS
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="http://libclc.llvm.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz ${SRC_PATCHES}"
+fi
+
+LICENSE="|| ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-devel/clang-3.4
+	>=sys-devel/llvm-3.4"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+src_unpack() {
+	if [[ $PV = 9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/libclc-llvm-3.5-compat.patch"
+}
+
+src_configure() {
+	./configure.py \
+		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
+		--prefix="${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}