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

2016-09-02 Thread Michał Górny 
commit: a1621d0c04dd6ddc4b5e4ebcef40501289292470
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep  2 20:45:36 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep  2 21:40:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1621d0c

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.

 ...ystem-llvm-lit-when-lit.py-does-not-exist.patch | 33 --
 ...y-Install-as-llvm-lit-as-cmake-expects-it.patch | 30 
 sys-devel/llvm/llvm-.ebuild| 25 
 3 files changed, 5 insertions(+), 83 deletions(-)

diff --git 
a/sys-devel/llvm/files//0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
 
b/sys-devel/llvm/files//0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
deleted file mode 100644
index 7245af0..
--- 
a/sys-devel/llvm/files//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?= 
-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//0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
 
b/sys-devel/llvm/files//0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
deleted file mode 100644
index 53726aa..
--- 
a/sys-devel/llvm/files//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?= 
-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
-

diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild
index 6fbe8c8..2f4485f 100644
--- a/sys-devel/llvm/llvm-.ebuild
+++ b/sys-devel/llvm/llvm-.ebuild
@@ -7,11 +7,10 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to lib32 find_library fix)
 CMAKE_MIN_VERSION=3.6.1-r1
-DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
 
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic git-r3 \
-   multilib-minimal pax-utils toolchain-funcs
+inherit check-reqs cmake-utils flag-o-matic git-r3 \
+   multilib-minimal pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/;
@@ -25,7 +24,6 @@ KEYWORDS=""
 IUSE="debug +doc gold libedit +libffi multitarget ncurses ocaml test
video_cards_radeon elibc_musl kernel_Darwin"
 
-# python is needed for llvm-lit (which is installed)
 RDEPEND="
sys-libs/zlib:0=
gold? (

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

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

sys-devel/llvm: Remove unnecessary gtest patch

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

diff --git a/sys-devel/llvm/files//0005-cmake-Do-not-install-libgtest.patch 
b/sys-devel/llvm/files//0005-cmake-Do-not-install-libgtest.patch
deleted file mode 100644
index a24977c..
--- a/sys-devel/llvm/files//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?= 
-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-.ebuild b/sys-devel/llvm/llvm-.ebuild
index 9a16879..834c3d2 100644
--- a/sys-devel/llvm/llvm-.ebuild
+++ b/sys-devel/llvm/llvm-.ebuild
@@ -103,10 +103,6 @@ src_prepare() {
# https://llvm.org/bugs/show_bug.cgi?id=23781
eapply 
"${FILESDIR}"//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}"//0005-cmake-Do-not-install-libgtest.patch
-
# Allow custom cmake build types (like 'Gentoo')
eapply 
"${FILESDIR}"//0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch