Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Mon, 04 Oct 2021 13:29:40
Message-Id: 1633353929.f2d9718baa48a98e90754834b467dc61ad2675f0.mgorny@gentoo
1 commit: f2d9718baa48a98e90754834b467dc61ad2675f0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 4 13:25:29 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 13:25:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d9718b
7
8 dev-util/lldb: Make xml optional and depend on libxml2 directly
9
10 Closes: https://bugs.gentoo.org/815361
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-util/lldb/lldb-12.0.1.ebuild | 6 ++++--
14 dev-util/lldb/lldb-13.0.0.9999.ebuild | 6 ++++--
15 dev-util/lldb/lldb-13.0.0.ebuild | 6 ++++--
16 dev-util/lldb/lldb-14.0.0.9999.ebuild | 6 ++++--
17 4 files changed, 16 insertions(+), 8 deletions(-)
18
19 diff --git a/dev-util/lldb/lldb-12.0.1.ebuild b/dev-util/lldb/lldb-12.0.1.ebuild
20 index a77e4e911fd..432b152fa27 100644
21 --- a/dev-util/lldb/lldb-12.0.1.ebuild
22 +++ b/dev-util/lldb/lldb-12.0.1.ebuild
23 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
24 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
25 SLOT="0"
26 KEYWORDS="amd64 arm arm64 x86"
27 -IUSE="+libedit lzma ncurses +python test"
28 +IUSE="+libedit lzma ncurses +python test +xml"
29 REQUIRED_USE=${PYTHON_REQUIRED_USE}
30 RESTRICT="test"
31
32 @@ -26,7 +26,8 @@ RDEPEND="
33 ')
34 ${PYTHON_DEPS}
35 )
36 - ~sys-devel/clang-${PV}[xml]
37 + xml? ( dev-libs/libxml2:= )
38 + ~sys-devel/clang-${PV}
39 ~sys-devel/llvm-${PV}"
40 DEPEND="${RDEPEND}"
41 BDEPEND="
42 @@ -56,6 +57,7 @@ src_configure() {
43 -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
44 -DLLDB_ENABLE_PYTHON=$(usex python)
45 -DLLDB_ENABLE_LZMA=$(usex lzma)
46 + -DLLDB_ENABLE_LIBXML2=$(usex xml)
47 -DLLDB_USE_SYSTEM_SIX=1
48 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
49
50
51 diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild
52 index ce8729bdc59..55d8be1e273 100644
53 --- a/dev-util/lldb/lldb-13.0.0.9999.ebuild
54 +++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild
55 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
56 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
57 SLOT="0"
58 KEYWORDS=""
59 -IUSE="debug +libedit lzma ncurses +python test"
60 +IUSE="debug +libedit lzma ncurses +python test +xml"
61 REQUIRED_USE=${PYTHON_REQUIRED_USE}
62 RESTRICT="test"
63
64 @@ -26,7 +26,8 @@ RDEPEND="
65 ')
66 ${PYTHON_DEPS}
67 )
68 - ~sys-devel/clang-${PV}[xml]
69 + xml? ( dev-libs/libxml2:= )
70 + ~sys-devel/clang-${PV}
71 ~sys-devel/llvm-${PV}"
72 DEPEND="${RDEPEND}"
73 BDEPEND="
74 @@ -59,6 +60,7 @@ src_configure() {
75 -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
76 -DLLDB_ENABLE_PYTHON=$(usex python)
77 -DLLDB_ENABLE_LZMA=$(usex lzma)
78 + -DLLDB_ENABLE_LIBXML2=$(usex xml)
79 -DLLDB_USE_SYSTEM_SIX=1
80 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
81
82
83 diff --git a/dev-util/lldb/lldb-13.0.0.ebuild b/dev-util/lldb/lldb-13.0.0.ebuild
84 index 474e09e9cbd..0369511ea6f 100644
85 --- a/dev-util/lldb/lldb-13.0.0.ebuild
86 +++ b/dev-util/lldb/lldb-13.0.0.ebuild
87 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
88 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
89 SLOT="0"
90 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
91 -IUSE="debug +libedit lzma ncurses +python test"
92 +IUSE="debug +libedit lzma ncurses +python test +xml"
93 REQUIRED_USE=${PYTHON_REQUIRED_USE}
94 RESTRICT="test"
95
96 @@ -26,7 +26,8 @@ RDEPEND="
97 ')
98 ${PYTHON_DEPS}
99 )
100 - ~sys-devel/clang-${PV}[xml]
101 + xml? ( dev-libs/libxml2:= )
102 + ~sys-devel/clang-${PV}
103 ~sys-devel/llvm-${PV}"
104 DEPEND="${RDEPEND}"
105 BDEPEND="
106 @@ -59,6 +60,7 @@ src_configure() {
107 -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
108 -DLLDB_ENABLE_PYTHON=$(usex python)
109 -DLLDB_ENABLE_LZMA=$(usex lzma)
110 + -DLLDB_ENABLE_LIBXML2=$(usex xml)
111 -DLLDB_USE_SYSTEM_SIX=1
112 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
113
114
115 diff --git a/dev-util/lldb/lldb-14.0.0.9999.ebuild b/dev-util/lldb/lldb-14.0.0.9999.ebuild
116 index ce8729bdc59..55d8be1e273 100644
117 --- a/dev-util/lldb/lldb-14.0.0.9999.ebuild
118 +++ b/dev-util/lldb/lldb-14.0.0.9999.ebuild
119 @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
120 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
121 SLOT="0"
122 KEYWORDS=""
123 -IUSE="debug +libedit lzma ncurses +python test"
124 +IUSE="debug +libedit lzma ncurses +python test +xml"
125 REQUIRED_USE=${PYTHON_REQUIRED_USE}
126 RESTRICT="test"
127
128 @@ -26,7 +26,8 @@ RDEPEND="
129 ')
130 ${PYTHON_DEPS}
131 )
132 - ~sys-devel/clang-${PV}[xml]
133 + xml? ( dev-libs/libxml2:= )
134 + ~sys-devel/clang-${PV}
135 ~sys-devel/llvm-${PV}"
136 DEPEND="${RDEPEND}"
137 BDEPEND="
138 @@ -59,6 +60,7 @@ src_configure() {
139 -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
140 -DLLDB_ENABLE_PYTHON=$(usex python)
141 -DLLDB_ENABLE_LZMA=$(usex lzma)
142 + -DLLDB_ENABLE_LIBXML2=$(usex xml)
143 -DLLDB_USE_SYSTEM_SIX=1
144 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
Report Message
Find on MARC Find on Google Groups