From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Mar 2018 16:53:27 +0100 Subject: gentoo resync : 29.03.2018 --- dev-util/lldb/Manifest | 13 +-- ...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 --------------------- dev-util/lldb/lldb-5.0.1.ebuild | 4 +- dev-util/lldb/lldb-6.0.0.ebuild | 4 +- dev-util/lldb/lldb-6.0.9999.ebuild | 4 +- dev-util/lldb/lldb-9999.ebuild | 4 +- 8 files changed, 8 insertions(+), 342 deletions(-) delete mode 100644 dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch delete mode 100644 dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch delete mode 100644 dev-util/lldb/lldb-4.0.1.ebuild (limited to 'dev-util/lldb') diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest index 26dad8db5103..390f40f2d214 100644 --- a/dev-util/lldb/Manifest +++ b/dev-util/lldb/Manifest @@ -1,14 +1,9 @@ -AUX 4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch 4415 BLAKE2B bad1c63cbd39941311ffd2a297e18cab62787a6596309a17e85638574cafc952a0f193a8d0d1ae6c71e4bbf22d44f8e59cd387524e489e393e843cf6032bb162 SHA512 9aa4a9618696d97b523e758725619a6cb6d4ca74058147185383b32ddc7db348bada379ad8c567a66a4bebd982c4e039aaae14ba44336408340378735c0b069c -AUX 4.0.1/0002-Fix-bug-28898.patch 3526 BLAKE2B d13f4e866c00763061347bc24908306e4f7fb6d0701d10d272475556d4213dd19a13abefaa660199a9c1369264a84fa2da23c09095f4e3b6e30b356b99b90dea SHA512 8a9167ba1b17bb6d373fd41755ce4436b199fb48a47e303bff4020a79f90c547ae3ca86525345c55536bdc03b9c3853baaebdf914df04ae92901a073ae5658aa -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 -EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a -EBUILD lldb-5.0.1.ebuild 3015 BLAKE2B 24c75d15e2898cd209df43f137b3e4fcad6ebbaaa0e66c9611d5a6cdd8666d5935c834ef3fd1fa02303c33a73e33f189b8bee25158dd5149222048f987f7f3bc SHA512 1773bab52a4794dc412ac3ac76eea3fdf1dcd2515009ba77b560c5972c44d0275a300206457cea89f4de08fc0103afd9a988404873d1d75b765e0460481c5436 -EBUILD lldb-6.0.0.ebuild 3113 BLAKE2B b5890afb5e652596b59ff558e5860869312f56e86f32c90f7f116300acea3717fe5522ec2d17c99ee90d74a5023cf98f5d3aa903b1ac2dbfe3a0060d85785ea6 SHA512 f50a83530a3fc71796b1ba92a72ea9ac2c50851fdbbd3f10b4736612079c91de7e1d689c4cd12650a73e3d07763952c87e9cdfd98d566f2e690d4de6830d5785 -EBUILD lldb-6.0.9999.ebuild 3063 BLAKE2B f0f2d6ba27ca4a94fcc5b63fbce6fe4cbba7e1ce98a56328af202c2bed290060986a9ad67934a3c24bf7085d6f058c10a594ea01c43b8ee6a1f1f66877381491 SHA512 15d0d4ba65c4a8c5eaf75087156eb4120c3552f5431e2de1c6da4767fb22e341aa0e4cf8ffeb309245cf2e088992828c9e3dff75fedf3e5b983563c3a811e135 -EBUILD lldb-9999.ebuild 3014 BLAKE2B cc865e54b690f663feced5456902d5037ac9549892116b6cb04e1fbda0f230769eb9c458ac080c37ff1bac248a9eda830b17baba50a211a6944a4c6d50820435 SHA512 60ea6864990a66c40fc9c537decca2d723684eb88aae248b7643a1c523b70b5207b34cc1c1e70cebf9680707b50b953d5e4b2f43438a0d356282679c98778c3d +EBUILD lldb-5.0.1.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c +EBUILD lldb-6.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912 +EBUILD lldb-6.0.9999.ebuild 2963 BLAKE2B 54d7cbb6d273667023d8beb7e5aeb55b2c332729e49c05ec6a2b79170b06e4287f16542878abbd6b27b13a6981629d264c269f27e3107eb9198e7f9ba7db4935 SHA512 5fb250ab99d6bdac31790f7035148f3da7115bb93d65359da3b757a75c90cb2f840b37ccd72a8374434081d2c677fe523862d19ada6a693eff7b6dac5f404f2f +EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 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 1b183d860a2d..000000000000 --- 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 -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 563d2f6813a2..000000000000 --- 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 -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 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 64a83e7105da..000000000000 --- 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} - !