| 1 |
commit: 0acb9e257add056f0666ca187cb7d2dd36835558 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 25 02:12:17 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 25 02:12:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acb9e25 |
| 7 |
|
| 8 |
sys-devel/llvm: Restore gtest patch for <9999, #592046 |
| 9 |
|
| 10 |
.../3.8.1/0005-cmake-Do-not-install-libgtest.patch | 30 ++++++++++++++++++++++ |
| 11 |
sys-devel/llvm/llvm-3.7.1-r3.ebuild | 2 +- |
| 12 |
sys-devel/llvm/llvm-3.8.0-r3.ebuild | 2 +- |
| 13 |
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 2 +- |
| 14 |
sys-devel/llvm/llvm-3.8.1.ebuild | 2 +- |
| 15 |
5 files changed, 34 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..a24977c |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch |
| 22 |
@@ -0,0 +1,30 @@ |
| 23 |
+From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001 |
| 24 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 25 |
+Date: Tue, 9 Jun 2015 11:58:52 +0200 |
| 26 |
+Subject: [PATCH 05/10] cmake: Do not install libgtest |
| 27 |
+ |
| 28 |
+libgtest is an internal test dependency, and should not be installed to |
| 29 |
+the live system as a part of LLVM. |
| 30 |
+ |
| 31 |
+Bug: http://llvm.org/bugs/show_bug.cgi?id=18341 |
| 32 |
+--- |
| 33 |
+ utils/unittest/CMakeLists.txt | 3 +++ |
| 34 |
+ 1 file changed, 3 insertions(+) |
| 35 |
+ |
| 36 |
+diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt |
| 37 |
+index c9a2cdd..bb4f667 100644 |
| 38 |
+--- a/utils/unittest/CMakeLists.txt |
| 39 |
++++ b/utils/unittest/CMakeLists.txt |
| 40 |
+@@ -37,6 +37,9 @@ if (PTHREAD_LIBRARY_PATH) |
| 41 |
+ list(APPEND LIBS pthread) |
| 42 |
+ endif() |
| 43 |
+ |
| 44 |
++# Delay building until the tests pull it in, and avoid installing it |
| 45 |
++set(EXCLUDE_FROM_ALL ON) |
| 46 |
++ |
| 47 |
+ add_llvm_library(gtest |
| 48 |
+ googletest/src/gtest-all.cc |
| 49 |
+ |
| 50 |
+-- |
| 51 |
+2.9.3 |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 55 |
index 02635d1..353bbff 100644 |
| 56 |
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 57 |
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 58 |
@@ -155,7 +155,7 @@ src_prepare() { |
| 59 |
|
| 60 |
# Prevent installing libgtest |
| 61 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 62 |
- eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 63 |
+ eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch |
| 64 |
|
| 65 |
# Fix llvm-config for shared linking, sane flags and return values |
| 66 |
# in order: |
| 67 |
|
| 68 |
diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 69 |
index 7bd13a8..1f865ea 100644 |
| 70 |
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 71 |
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 72 |
@@ -156,7 +156,7 @@ src_prepare() { |
| 73 |
|
| 74 |
# Prevent installing libgtest |
| 75 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 76 |
- eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 77 |
+ eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch |
| 78 |
|
| 79 |
# Allow custom cmake build types (like 'Gentoo') |
| 80 |
eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 81 |
|
| 82 |
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 83 |
index 7f096fc..cbead1d 100644 |
| 84 |
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 85 |
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 86 |
@@ -157,7 +157,7 @@ src_prepare() { |
| 87 |
|
| 88 |
# Prevent installing libgtest |
| 89 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 90 |
- eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 91 |
+ eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch |
| 92 |
|
| 93 |
# Allow custom cmake build types (like 'Gentoo') |
| 94 |
eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 95 |
|
| 96 |
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 97 |
index 22ae082..e1050f2 100644 |
| 98 |
--- a/sys-devel/llvm/llvm-3.8.1.ebuild |
| 99 |
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 100 |
@@ -156,7 +156,7 @@ src_prepare() { |
| 101 |
|
| 102 |
# Prevent installing libgtest |
| 103 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 104 |
- eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 105 |
+ eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch |
| 106 |
|
| 107 |
# Allow custom cmake build types (like 'Gentoo') |
| 108 |
eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
Archives