diff options
| author | Michał Górny <mgorny@gentoo.org> | 2016-09-02 22:45:36 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-09-02 23:40:02 +0200 |
| commit | a1621d0c04dd6ddc4b5e4ebcef40501289292470 (patch) | |
| tree | d10247b4d349d3f69622891c0c52ccc16a941a75 /sys-devel/llvm/files/9999 | |
| parent | d236c73285432b874fea74b1e4f6afc7b606e751 (diff) | |
| download | gentoo-a1621d0c04dd6ddc4b5e4ebcef40501289292470.tar.gz gentoo-a1621d0c04dd6ddc4b5e4ebcef40501289292470.tar.xz | |
sys-devel/llvm: Stop installing llvm-lit
Stop installing lit as llvm-lit since the correct install layout is
still unclear (wrt https://reviews.llvm.org/D23743), installed version
search is inconsistent and broken, and all reverse dependencies require
LLVM source checkout anyway and therefore use the internal lit package
included in it. The install will eventually be addressed later, most
likely as a split package.
Diffstat (limited to 'sys-devel/llvm/files/9999')
2 files changed, 0 insertions, 63 deletions
diff --git a/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch b/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch deleted file mode 100644 index 7245af07d2e..00000000000 --- a/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bcdf2c49b7686046f8a9a5664f0e46117997baf4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sun, 21 Aug 2016 23:19:40 +0200 -Subject: [PATCH 09/10] cmake: Use system llvm-lit when lit.py does not exist - in srcdir - -Modify the add_lit_target function to use lit.py from LLVM_MAIN_SRC_DIR -only when one does exist there, and otherwise fall back to looking for -system install of llvm-lit. This is based on a similar conditional in -clang's CMakeLists.txt, and makes it possible to run clang's tests when -built separately from LLVM with no access to the original sources. - -Patch: https://reviews.llvm.org/D23742 ---- - cmake/modules/AddLLVM.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 83a2359..87540d5 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -1081,7 +1081,7 @@ function(add_lit_target target comment) - if (NOT CMAKE_CFG_INTDIR STREQUAL ".") - list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR}) - endif () -- if (LLVM_MAIN_SRC_DIR) -+ if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) - set (LIT_COMMAND ${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) - else() - find_program(LIT_COMMAND llvm-lit) --- -2.9.3 - diff --git a/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch b/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch deleted file mode 100644 index 53726aa3f5e..00000000000 --- a/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 242fd2cbad1075d4cc0e3a3b64652dbc766bd117 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sun, 21 Aug 2016 23:20:11 +0200 -Subject: [PATCH 10/10] lit/setup.py: Install as llvm-lit (as cmake expects it) - -Modify the setup.py for lit to install the entry point as llvm-lit -(instead of lit) since this is the name expected by functions in -AddLLVM.cmake. - -Patch: https://reviews.llvm.org/D23743 ---- - utils/lit/setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/lit/setup.py b/utils/lit/setup.py -index 10de6bb..c57e0aa 100644 ---- a/utils/lit/setup.py -+++ b/utils/lit/setup.py -@@ -71,7 +71,7 @@ http://llvm.org/svn/llvm-project/llvm/trunk/utils/lit. - packages = find_packages(), - entry_points = { - 'console_scripts': [ -- 'lit = lit:main', -+ 'llvm-lit = lit:main', - ], - } - ) --- -2.9.3 - |