[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/, sys-devel/llvm/

[Michał Górny]

commit:     f54e32c9597ab061f7dc8208dc5441969f521f21
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 18:28:37 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 18:32:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54e32c9

sys-devel/llvm: Remove unnecessary gtest patch

 .../9999/0005-cmake-Do-not-install-libgtest.patch  | 30 ----------------------
 sys-devel/llvm/llvm-9999.ebuild                    |  4 ---
 2 files changed, 34 deletions(-)

diff --git a/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch
deleted file mode 100644
index a24977c..00000000
--- a/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
-Date: Tue, 9 Jun 2015 11:58:52 +0200
-Subject: [PATCH 05/10] cmake: Do not install libgtest
-
-libgtest is an internal test dependency, and should not be installed to
-the live system as a part of LLVM.
-
-Bug: http://llvm.org/bugs/show_bug.cgi?id=18341
----
- utils/unittest/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
-index c9a2cdd..bb4f667 100644
---- a/utils/unittest/CMakeLists.txt
-+++ b/utils/unittest/CMakeLists.txt
-@@ -37,6 +37,9 @@ if (PTHREAD_LIBRARY_PATH)
-   list(APPEND LIBS pthread)
- endif()
- 
-+# Delay building until the tests pull it in, and avoid installing it
-+set(EXCLUDE_FROM_ALL ON)
-+
- add_llvm_library(gtest
-   googletest/src/gtest-all.cc
- 
--- 
-2.9.3
-

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 9a16879..834c3d2 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -103,10 +103,6 @@ src_prepare() {
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
 	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
-	# Prevent installing libgtest
-	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
-
 	# Allow custom cmake build types (like 'Gentoo')
 	eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch