[gentoo-commits] repo/gentoo:master commit in: dev-util/lldb/files/4.0.1/, dev-util/lldb/

[Michał Górny]

commit:     a68ac3f988e81874d5eb412f99070df55a09a60f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 07:16:29 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 07:18:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68ac3f9

dev-util/lldb: Drop old 4.0.1

 dev-util/lldb/Manifest                             |   2 -
 ...nding-LLDB-tools-when-building-stand-alon.patch | 102 -----------------
 dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch |  98 -----------------
 dev-util/lldb/lldb-4.0.1.ebuild                    | 121 ---------------------
 4 files changed, 323 deletions(-)

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 943f95115b5..4a74a52fc33 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,6 +1,4 @@
-DIST lldb-4.0.1.src.tar.xz 19088212 BLAKE2B 0fcc76de5777c0724a207330bc5e027065fa55628506fe8cbd4f4e7ab397fc3802ae9580a8e41e14c1b3448453c1f735725100fb69c3048a44bd9e5748ab3cfa SHA512 1d94d7dfcc0614b16d0ef83436bbe814b39e34ba18394361bb9f13ad408ae9b29affa9a5d58c50c8dcd83765a39ae4d59ffabb7d8cd1358fd2fbd198b2de2ab6
 DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
 DIST lldb-6.0.0.src.tar.xz 19317956 BLAKE2B e9ebdd61c5116d3e6be3542674b1e3eebba19b4a2107da153565fd95ed24a97248fb80ce5220b4dce2b6e3ac5b61fcdb594e34d6af25e7737575c3f31cd45fbe SHA512 9679d1dda0c71681b1f8c5a22e775c0262de26dc5b091e1db189968b97ed3aed45991381d529b3fd4b3ab28112453f519045485708f97f765d3e3131b2a918b7
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c

diff --git a/dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch b/dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch
deleted file mode 100644
index 1b183d860a2..00000000000
--- a/dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6a9aab954c32a2d3d13a0fe5fc984e9787e9f794 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@g.o>
-Date: Sun, 19 Feb 2017 22:11:38 +0000
-Subject: [PATCH] [test] Fix finding LLDB tools when building stand-alone
-
-Use both LLDB- and LLVM-specific tool/library directories when LLDB is
-being built stand-alone. This ensures that the freshly-built tools
-(and libraries) are used correctly.
-
-Without this patch, the test suite uses LLVM_TOOLS_DIR and LLVM_LIBS_DIR
-to locate lldb, and set PATH and LD_LIBRARY_PATH. When doing
-a stand-alone build, these variables represent the installed LLVM.
-As a result, tests either fail due to missing lldb executable
-or use an earlier installed LLDB version rather than the one being
-built.
-
-To solve this, additional LLDB_TOOLS_DIR and LLDB_LIBS_DIR variables
-are added and populated using LLVM_*_OUTPUT_INTDIR. Those variables
-contain directories used to output built executables and libraries.
-In stand-alone builds, they represent the build-tree directories
-used by LLDB. In integrated builds, they have the same values as
-LLVM_*_DIR and therefore using them does not harm.
-
-The new variables are prepended to PATH and LD_LIBRARY_PATH to ensure
-that freshly built binaries are preferred over potentially earlier
-installed ones. Furthermore, paths used to locate various tools are
-updated to match appropriate locations.
-
-Differential Revision: https://reviews.llvm.org/D29985
-
-git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@295621 91177308-0d34-0410-b5e6-96231b3b80d8
----
- lit/lit.cfg         | 18 ++++++++++++------
- lit/lit.site.cfg.in |  2 ++
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/lit/lit.cfg b/lit/lit.cfg
-index dd89b45fa..a3d5f9ca7 100644
---- a/lit/lit.cfg
-+++ b/lit/lit.cfg
-@@ -39,18 +39,24 @@ config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
- 
- # Tweak the PATH to include the tools dir and the scripts dir.
- if lldb_obj_root is not None:
-+    lldb_tools_dir = getattr(config, 'lldb_tools_dir', None)
-+    if not lldb_tools_dir:
-+        lit_config.fatal('No LLDB tools dir set!')
-     llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-     if not llvm_tools_dir:
-         lit_config.fatal('No LLVM tools dir set!')
--    path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
-+    path = os.path.pathsep.join((lldb_tools_dir, llvm_tools_dir, config.environment['PATH']))
-     path = os.path.pathsep.join((os.path.join(getattr(config, 'llvm_src_root', None),'test','Scripts'),path))
- 
-     config.environment['PATH'] = path
- 
-+    lldb_libs_dir = getattr(config, 'lldb_libs_dir', None)
-+    if not lldb_libs_dir:
-+        lit_config.fatal('No LLDB libs dir set!')
-     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
-     if not llvm_libs_dir:
-         lit_config.fatal('No LLVM libs dir set!')
--    path = os.path.pathsep.join((llvm_libs_dir,
-+    path = os.path.pathsep.join((lldb_libs_dir, llvm_libs_dir,
-                                  config.environment.get('LD_LIBRARY_PATH','')))
-     config.environment['LD_LIBRARY_PATH'] = path
- 
-@@ -115,14 +121,14 @@ if config.test_exec_root is None:
- # Register substitutions
- config.substitutions.append(('%python', config.python_executable))
- 
--debugserver = lit.util.which('debugserver', llvm_tools_dir)
--lldb = lit.util.which('lldb', llvm_tools_dir)
-+debugserver = lit.util.which('debugserver', lldb_tools_dir)
-+lldb = lit.util.which('lldb', lldb_tools_dir)
- 
- if not os.path.exists(config.cc):
--    config.cc = lit.util.which(config.cc, llvm_tools_dir)
-+    config.cc = lit.util.which(config.cc, config.environment['PATH'])
- 
- if not os.path.exists(config.cxx):
--    config.cxx = lit.util.which(config.cxx, llvm_tools_dir)
-+    config.cxx = lit.util.which(config.cxx, config.environment['PATH'])
- 
- if platform.system() in ['Darwin']:
-     try:
-diff --git a/lit/lit.site.cfg.in b/lit/lit.site.cfg.in
-index 904521c9d..03aa3df9a 100644
---- a/lit/lit.site.cfg.in
-+++ b/lit/lit.site.cfg.in
-@@ -6,6 +6,8 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
- config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
- config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
- config.lldb_obj_root = "@LLDB_BINARY_DIR@"
-+config.lldb_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
-+config.lldb_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
- config.target_triple = "@TARGET_TRIPLE@"
- config.python_executable = "@PYTHON_EXECUTABLE@"
- config.cc = "@CMAKE_C_COMPILER@"
--- 
-2.12.0
-

diff --git a/dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch b/dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch
deleted file mode 100644
index 563d2f6813a..00000000000
--- a/dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 9ad9480c3a380a04b3dbe869c0675d6bba37247b Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@×××.com>
-Date: Thu, 25 May 2017 20:12:30 +0000
-Subject: [PATCH] Fix bug #28898 lldb: libedit produces garbled, unusable input
- on Linux
-
-Apply patch from Christos Zoulas, upstream libedit developer.
-It has been tested on NetBSD/amd64.
-
-New code supports combination of wide libedit and disabled
-LLDB_EDITLINE_USE_WCHAR, which was the popular case on Linux
-systems.
-
-
-git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@303907 91177308-0d34-0410-b5e6-96231b3b80d8
----
- include/lldb/Host/Editline.h    | 12 +++++++++---
- source/Host/common/Editline.cpp |  8 ++++----
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
-index 2b1a8e047..0b75e9c92 100644
---- a/include/lldb/Host/Editline.h
-+++ b/include/lldb/Host/Editline.h
-@@ -82,8 +82,14 @@ using EditLineStringStreamType = std::stringstream;
- using EditLineCharType = char;
- #endif
- 
-+#ifdef EL_CLIENTDATA	/* editline with wide support + wide char read function */
-+using EditLineGetCharType = wchar_t;
-+#else
-+using EditLineGetCharType = char;
-+#endif
-+
- typedef int (*EditlineGetCharCallbackType)(::EditLine *editline,
--                                           EditLineCharType *c);
-+                                           EditLineGetCharType *c);
- typedef unsigned char (*EditlineCommandCallbackType)(::EditLine *editline,
-                                                      int ch);
- typedef const char *(*EditlinePromptCallbackType)(::EditLine *editline);
-@@ -270,7 +276,7 @@ private:
- 
-   /// Character reading implementation for EditLine that supports our multi-line
-   /// editing trickery.
--  int GetCharacter(EditLineCharType *c);
-+  int GetCharacter(EditLineGetCharType *c);
- 
-   /// Prompt implementation for EditLine.
-   const char *Prompt();
-@@ -323,7 +329,7 @@ private:
-   /// single or multi-line editing.
-   void ConfigureEditor(bool multiline);
- 
--  bool CompleteCharacter(char ch, EditLineCharType &out);
-+  bool CompleteCharacter(char ch, EditLineGetCharType &out);
- 
- private:
- #if LLDB_EDITLINE_USE_WCHAR
-diff --git a/source/Host/common/Editline.cpp b/source/Host/common/Editline.cpp
-index 7d4b398a1..7b580dde6 100644
---- a/source/Host/common/Editline.cpp
-+++ b/source/Host/common/Editline.cpp
-@@ -474,7 +474,7 @@ unsigned char Editline::RecallHistory(bool earlier) {
-   return CC_NEWLINE;
- }
- 
--int Editline::GetCharacter(EditLineCharType *c) {
-+int Editline::GetCharacter(EditLineGetCharType *c) {
-   const LineInfoW *info = el_wline(m_editline);
- 
-   // Paint a faint version of the desired prompt over the version libedit draws
-@@ -969,7 +969,7 @@ void Editline::ConfigureEditor(bool multiline) {
-          }));
- 
-   el_wset(m_editline, EL_GETCFN, (EditlineGetCharCallbackType)([](
--                                     EditLine *editline, EditLineCharType *c) {
-+                                     EditLine *editline, EditLineGetCharType *c) {
-             return Editline::InstanceFor(editline)->GetCharacter(c);
-           }));
- 
-@@ -1360,12 +1360,12 @@ void Editline::PrintAsync(Stream *stream, const char *s, size_t len) {
-   }
- }
- 
--bool Editline::CompleteCharacter(char ch, EditLineCharType &out) {
-+bool Editline::CompleteCharacter(char ch, EditLineGetCharType &out) {
- #if !LLDB_EDITLINE_USE_WCHAR
-   if (ch == (char)EOF)
-     return false;
- 
--  out = ch;
-+  out = (unsigned char)ch;
-   return true;
- #else
-   std::codecvt_utf8<wchar_t> cvt;
--- 
-2.13.1
-

diff --git a/dev-util/lldb/lldb-4.0.1.ebuild b/dev-util/lldb/lldb-4.0.1.ebuild
deleted file mode 100644
index 64a83e7105d..00000000000
--- a/dev-util/lldb/lldb-4.0.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
-DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use test; then
-		mv llvm-* llvm || die
-	fi
-}
-
-src_prepare() {
-	# fix tests in stand-alone build
-	eapply "${FILESDIR}"/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch
-	# fix compatibility with new libedit
-	eapply "${FILESDIR}"/4.0.1/0002-Fix-bug-28898.patch
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove bundled six module
-		rm "${D}$(python_get_sitedir)/six.py" || die
-
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}