Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/, sys-devel/clang/files/9999/
Date: Fri, 02 Sep 2016 21:40:15
Message-Id: 1472852400.d236c73285432b874fea74b1e4f6afc7b606e751.mgorny@gentoo
1 commit: d236c73285432b874fea74b1e4f6afc7b606e751
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 2 20:32:48 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 21:40:00 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d236c732
7
8 sys-devel/clang: Remove unnecessary llvm-lit search patch
9
10 Remove the llvm-lit search patch since it is no longer necessary and its
11 correctness is doubtful. Per https://reviews.llvm.org/D23743 the name
12 llvm-lit is not intended for system-wide install of lit. However, this
13 does not matter since the internal copy of lit is used when LLVM source
14 checkout is available, and unittests require this checkout to be
15 available when running tests.
16
17 sys-devel/clang/clang-9999.ebuild | 2 --
18 ...t-llvm-lit-search-to-match-the-one-in-LLV.patch | 29 ----------------------
19 2 files changed, 31 deletions(-)
20
21 diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
22 index 862afbd..1c89ad5 100644
23 --- a/sys-devel/clang/clang-9999.ebuild
24 +++ b/sys-devel/clang/clang-9999.ebuild
25 @@ -99,8 +99,6 @@ src_prepare() {
26 # automatically select active system GCC's libraries, bugs #406163 and #417913
27 # TODO: cross-linux tests broken by this one
28 eapply "${FILESDIR}"/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
29 - # adjust llvm-lit search to match LLVM cmake macros
30 - eapply "${FILESDIR}"/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch
31 # support overriding clang runtime install directory
32 eapply "${FILESDIR}"/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch
33 # support overriding LLVMgold.so plugin directory
34
35 diff --git a/sys-devel/clang/files/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch b/sys-devel/clang/files/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch
36 deleted file mode 100644
37 index bcf409c..00000000
38 --- a/sys-devel/clang/files/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch
39 +++ /dev/null
40 @@ -1,29 +0,0 @@
41 -From d7bc0e05e8064e0c939db6c2fb6d215fd0340708 Mon Sep 17 00:00:00 2001
42 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
43 -Date: Sun, 21 Aug 2016 23:30:39 +0200
44 -Subject: [PATCH 4/7] cmake: Adjust llvm-lit search to match the one in LLVM
45 -
46 -Adjust the system lit executable search to look for llvm-lit as that is
47 -the name used in AddLLVM.cmake installed by LLVM.
48 -
49 -Patch: https://reviews.llvm.org/D23745
50 ----
51 - CMakeLists.txt | 2 +-
52 - 1 file changed, 1 insertion(+), 1 deletion(-)
53 -
54 -diff --git a/CMakeLists.txt b/CMakeLists.txt
55 -index aee0d0a..e95ab52 100644
56 ---- a/CMakeLists.txt
57 -+++ b/CMakeLists.txt
58 -@@ -140,7 +140,7 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
59 - endif()
60 - else()
61 - # Seek installed Lit.
62 -- find_program(LLVM_LIT "lit.py" ${LLVM_MAIN_SRC_DIR}/utils/lit
63 -+ find_program(LLVM_LIT "llvm-lit" ${LLVM_MAIN_SRC_DIR}/utils/lit
64 - DOC "Path to lit.py")
65 - endif()
66 -
67 ---
68 -2.9.3
69 -