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: dev-util/lldb/
Date: Fri, 11 Oct 2019 18:57:34
Message-Id: 1570820233.3ce078da884b0e393139f6707b40004b0120d003.mgorny@gentoo
1 commit: 3ce078da884b0e393139f6707b40004b0120d003
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 18:27:55 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 11 18:57:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce078da
7
8 dev-util/lldb: Drop redundant 8.0.0
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-util/lldb/Manifest | 2 -
13 dev-util/lldb/lldb-8.0.0.ebuild | 118 ----------------------------------------
14 2 files changed, 120 deletions(-)
15
16 diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
17 index 8d90851ef1b..ab2980eec2f 100644
18 --- a/dev-util/lldb/Manifest
19 +++ b/dev-util/lldb/Manifest
20 @@ -1,8 +1,6 @@
21 DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
22 -DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
23 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
24 DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bfe7c834e1e50e15be1c53dc8003cc6ed8ad4c83eef662b775997395bdb7e70835f94eca3768288fcbfeece68356b SHA512 86455d9d9866cde75e8d9bee7ddeb2680088dbc671e7d0c7bfff4c68ac963bc293bcaaf1a595db2b5529ddeee0dd0057ece37c90ee4ea194ac5e3fdb3122de01
25 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
26 -DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
27 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
28 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
29
30 diff --git a/dev-util/lldb/lldb-8.0.0.ebuild b/dev-util/lldb/lldb-8.0.0.ebuild
31 deleted file mode 100644
32 index c484dbe87ba..00000000000
33 --- a/dev-util/lldb/lldb-8.0.0.ebuild
34 +++ /dev/null
35 @@ -1,118 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
42 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
43 -CMAKE_MIN_VERSION=3.7.0-r1
44 -PYTHON_COMPAT=( python2_7 )
45 -
46 -inherit cmake-utils llvm multiprocessing python-single-r1 \
47 - toolchain-funcs
48 -
49 -MY_P=${P/_/}.src
50 -LLVM_P=llvm-${PV/_/}.src
51 -
52 -DESCRIPTION="The LLVM debugger"
53 -HOMEPAGE="https://llvm.org/"
54 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
55 - test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
56 -
57 -LICENSE="UoI-NCSA"
58 -SLOT="0"
59 -KEYWORDS="~amd64 ~arm64 ~x86"
60 -IUSE="libedit ncurses +python test"
61 -RESTRICT="!test? ( test )"
62 -
63 -RDEPEND="
64 - libedit? ( dev-libs/libedit:0= )
65 - ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
66 - python? ( dev-python/six[${PYTHON_USEDEP}]
67 - ${PYTHON_DEPS} )
68 - ~sys-devel/clang-${PV}[xml]
69 - ~sys-devel/llvm-${PV}
70 - !<sys-devel/llvm-4.0"
71 -DEPEND="${RDEPEND}
72 - python? ( >=dev-lang/swig-3.0.11 )
73 - test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
74 - ${PYTHON_DEPS}"
75 -
76 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
77 -
78 -S=${WORKDIR}/${MY_P}
79 -
80 -# least intrusive of all
81 -CMAKE_BUILD_TYPE=RelWithDebInfo
82 -
83 -pkg_setup() {
84 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
85 - python-single-r1_pkg_setup
86 -}
87 -
88 -src_unpack() {
89 - einfo "Unpacking ${MY_P}.tar.xz ..."
90 - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
91 -
92 - if use test; then
93 - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
94 - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
95 - "${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
96 - mv "${LLVM_P}" llvm || die
97 - fi
98 -}
99 -
100 -src_configure() {
101 - local mycmakeargs=(
102 - -DLLDB_DISABLE_CURSES=$(usex !ncurses)
103 - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
104 - -DLLDB_DISABLE_PYTHON=$(usex !python)
105 - -DLLDB_USE_SYSTEM_SIX=1
106 - -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
107 -
108 - -DLLDB_INCLUDE_TESTS=$(usex test)
109 -
110 - # TODO: fix upstream to detect this properly
111 - -DHAVE_LIBDL=ON
112 - -DHAVE_LIBPTHREAD=ON
113 -
114 - # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
115 - # and TERMINFO_LIBS... so just force FindCurses.cmake to use
116 - # ncurses with complete library set (including autodetection
117 - # of -ltinfo)
118 - -DCURSES_NEED_NCURSES=ON
119 - )
120 - use test && mycmakeargs+=(
121 - -DLLVM_BUILD_TESTS=$(usex test)
122 - # compilers for lit tests
123 - -DLLDB_TEST_C_COMPILER="$(type -P clang)"
124 - -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
125 -
126 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
127 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
128 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
129 - )
130 -
131 - cmake-utils_src_configure
132 -}
133 -
134 -src_test() {
135 - cmake-utils_src_make check-lldb-lit
136 - use python && cmake-utils_src_make check-lldb
137 -}
138 -
139 -src_install() {
140 - cmake-utils_src_install
141 -
142 - # oh my...
143 - if use python; then
144 - # remove custom readline.so for now
145 - # TODO: figure out how to deal with it
146 - # upstream is basically building a custom readline.so with -ledit
147 - # to avoid symbol collisions between readline and libedit...
148 - rm "${D}$(python_get_sitedir)/readline.so" || die
149 -
150 - # byte-compile the modules
151 - python_optimize
152 - fi
153 -}