sys-devel/llvm: Restore gtest patch for <9999, #592046

diff --git a/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch
new file mode 100644 (file)
index 0000000..a24977c
--- /dev/null
+++ b/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch
@@ -0,0 +1,30 @@
+From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+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-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 02635d1e52d0e470af39061def55158e670b68c7..353bbff39151f5224ea561f3724fe8cac81e8138 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -155,7 +155,7 @@ src_prepare() {
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
-       eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
+       eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch
 
        # Fix llvm-config for shared linking, sane flags and return values
        # in order:

diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
index 7bd13a8a87cf2777acbb58428ef3c579d803f5be..1f865eab1ad947ff4157b3f3b2e617e81777b82a 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
@@ -156,7 +156,7 @@ src_prepare() {
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
-       eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
+       eapply "${FILESDIR}"/3.8.1/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

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 7f096fcfe21ad35e9c2f26e715cc74591cd72c01..cbead1dacfe42d8dd812c1d6a33a8fbfe3965e76 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -157,7 +157,7 @@ src_prepare() {
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
-       eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
+       eapply "${FILESDIR}"/3.8.1/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

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 22ae082f028f953c6fb5d55542e1019a5b81f1e2..e1050f201c0aa9a19d5f89fe789301ac337931b1 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -156,7 +156,7 @@ src_prepare() {
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
-       eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
+       eapply "${FILESDIR}"/3.8.1/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