1 |
commit: 4ab1a18d0f7017ebb87017dc429eb154aac78c78 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 7 20:58:09 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 7 20:58:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab1a18d |
7 |
|
8 |
dev-util/bcc: drop 0.19.0-r1, 0.20.0-r1 |
9 |
|
10 |
Newer versions have fixed issues with allowed llvm slots. |
11 |
gethostlatency seems to work fine with version 0.22.0-r1 |
12 |
|
13 |
Closes: https://bugs.gentoo.org/783693 |
14 |
Closes: https://bugs.gentoo.org/782736 |
15 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
16 |
|
17 |
dev-util/bcc/Manifest | 2 - |
18 |
dev-util/bcc/bcc-0.19.0-r1.ebuild | 107 -------------------------------------- |
19 |
dev-util/bcc/bcc-0.20.0-r1.ebuild | 107 -------------------------------------- |
20 |
3 files changed, 216 deletions(-) |
21 |
|
22 |
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest |
23 |
index dd3da7474f9..a104554eb55 100644 |
24 |
--- a/dev-util/bcc/Manifest |
25 |
+++ b/dev-util/bcc/Manifest |
26 |
@@ -1,3 +1 @@ |
27 |
-DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3 |
28 |
-DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc |
29 |
DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792 |
30 |
|
31 |
diff --git a/dev-util/bcc/bcc-0.19.0-r1.ebuild b/dev-util/bcc/bcc-0.19.0-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index c331a015d80..00000000000 |
34 |
--- a/dev-util/bcc/bcc-0.19.0-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,107 +0,0 @@ |
37 |
-# Copyright 1999-2021 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-LUA_COMPAT=( luajit ) |
43 |
-PYTHON_COMPAT=( python3_{7..9} ) |
44 |
- |
45 |
-inherit cmake linux-info llvm lua-single python-r1 |
46 |
- |
47 |
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
48 |
-HOMEPAGE="https://iovisor.github.io/bcc/" |
49 |
- |
50 |
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
51 |
- |
52 |
-LICENSE="Apache-2.0" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
55 |
-IUSE="+lua test" |
56 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
57 |
- lua? ( ${LUA_REQUIRED_USE} )" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- ~dev-libs/libbpf-0.3:=[static-libs(-)] |
61 |
- >=sys-kernel/linux-headers-4.14 |
62 |
- >=dev-libs/elfutils-0.166:= |
63 |
- <=sys-devel/clang-13:= |
64 |
- <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] |
65 |
- lua? ( ${LUA_DEPS} ) |
66 |
- ${PYTHON_DEPS} |
67 |
-" |
68 |
-DEPEND="${RDEPEND} |
69 |
- test? ( |
70 |
- || ( |
71 |
- net-misc/iputils[arping] |
72 |
- net-analyzer/arping |
73 |
- ) |
74 |
- net-analyzer/netperf |
75 |
- net-misc/iperf:* |
76 |
- ) |
77 |
-" |
78 |
-BDEPEND=" |
79 |
- dev-util/cmake |
80 |
- virtual/pkgconfig |
81 |
-" |
82 |
- |
83 |
-PATCHES=( |
84 |
- "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" |
85 |
- "${FILESDIR}/bcc-0.14.0-cmakelists.patch" |
86 |
-) |
87 |
- |
88 |
-# tests need root access |
89 |
-RESTRICT="test" |
90 |
- |
91 |
-pkg_pretend() { |
92 |
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF |
93 |
- ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL |
94 |
- ~KPROBES" |
95 |
- |
96 |
- check_extra_config |
97 |
-} |
98 |
- |
99 |
-pkg_setup() { |
100 |
- LLVM_MAX_SLOT=11 llvm_pkg_setup |
101 |
- python_setup |
102 |
-} |
103 |
- |
104 |
-src_prepare() { |
105 |
- local bpf_link_path |
106 |
- |
107 |
- # this avoids bundling |
108 |
- bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die |
109 |
- ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die |
110 |
- |
111 |
- cmake_src_prepare |
112 |
-} |
113 |
- |
114 |
-python_add_impl() { |
115 |
- bcc_python_impls+="${EPYTHON};" |
116 |
-} |
117 |
- |
118 |
-src_configure() { |
119 |
- local bcc_python_impls |
120 |
- python_foreach_impl python_add_impl |
121 |
- |
122 |
- local -a mycmakeargs=( |
123 |
- -DREVISION=${PV%%_*} |
124 |
- -DENABLE_LLVM_SHARED=ON |
125 |
- -DCMAKE_USE_LIBBPF_PACKAGE=ON |
126 |
- -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}" |
127 |
- -DPYTHON_CMD="${bcc_python_impls%;}" |
128 |
- |
129 |
- ) |
130 |
- if use lua && use lua_single_target_luajit; then |
131 |
- mycmakeargs+=( -DWITH_LUAJIT=1 ) |
132 |
- fi |
133 |
- |
134 |
- cmake_src_configure |
135 |
-} |
136 |
- |
137 |
-src_install() { |
138 |
- cmake_src_install |
139 |
- python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools") |
140 |
- python_foreach_impl python_optimize |
141 |
- |
142 |
- newenvd "${FILESDIR}"/60bcc.env 60bcc.env |
143 |
-} |
144 |
|
145 |
diff --git a/dev-util/bcc/bcc-0.20.0-r1.ebuild b/dev-util/bcc/bcc-0.20.0-r1.ebuild |
146 |
deleted file mode 100644 |
147 |
index 5e202f2d11a..00000000000 |
148 |
--- a/dev-util/bcc/bcc-0.20.0-r1.ebuild |
149 |
+++ /dev/null |
150 |
@@ -1,107 +0,0 @@ |
151 |
-# Copyright 1999-2021 Gentoo Authors |
152 |
-# Distributed under the terms of the GNU General Public License v2 |
153 |
- |
154 |
-EAPI=7 |
155 |
- |
156 |
-LUA_COMPAT=( luajit ) |
157 |
-PYTHON_COMPAT=( python3_{7..9} ) |
158 |
- |
159 |
-inherit cmake linux-info llvm lua-single python-r1 |
160 |
- |
161 |
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
162 |
-HOMEPAGE="https://iovisor.github.io/bcc/" |
163 |
- |
164 |
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
165 |
- |
166 |
-LICENSE="Apache-2.0" |
167 |
-SLOT="0" |
168 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
169 |
-IUSE="+lua test" |
170 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
171 |
- lua? ( ${LUA_REQUIRED_USE} )" |
172 |
- |
173 |
-RDEPEND=" |
174 |
- ~dev-libs/libbpf-0.3:=[static-libs(-)] |
175 |
- >=sys-kernel/linux-headers-4.14 |
176 |
- >=dev-libs/elfutils-0.166:= |
177 |
- <=sys-devel/clang-13:= |
178 |
- <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] |
179 |
- lua? ( ${LUA_DEPS} ) |
180 |
- ${PYTHON_DEPS} |
181 |
-" |
182 |
-DEPEND="${RDEPEND} |
183 |
- test? ( |
184 |
- || ( |
185 |
- net-misc/iputils[arping] |
186 |
- net-analyzer/arping |
187 |
- ) |
188 |
- net-analyzer/netperf |
189 |
- net-misc/iperf:* |
190 |
- ) |
191 |
-" |
192 |
-BDEPEND=" |
193 |
- dev-util/cmake |
194 |
- virtual/pkgconfig |
195 |
-" |
196 |
- |
197 |
-PATCHES=( |
198 |
- "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" |
199 |
- "${FILESDIR}/bcc-0.14.0-cmakelists.patch" |
200 |
-) |
201 |
- |
202 |
-# tests need root access |
203 |
-RESTRICT="test" |
204 |
- |
205 |
-pkg_pretend() { |
206 |
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF |
207 |
- ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL |
208 |
- ~KPROBES" |
209 |
- |
210 |
- check_extra_config |
211 |
-} |
212 |
- |
213 |
-pkg_setup() { |
214 |
- LLVM_MAX_SLOT=12 llvm_pkg_setup |
215 |
- python_setup |
216 |
-} |
217 |
- |
218 |
-src_prepare() { |
219 |
- local bpf_link_path |
220 |
- |
221 |
- # this avoids bundling |
222 |
- bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die |
223 |
- ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die |
224 |
- |
225 |
- cmake_src_prepare |
226 |
-} |
227 |
- |
228 |
-python_add_impl() { |
229 |
- bcc_python_impls+="${EPYTHON};" |
230 |
-} |
231 |
- |
232 |
-src_configure() { |
233 |
- local bcc_python_impls |
234 |
- python_foreach_impl python_add_impl |
235 |
- |
236 |
- local -a mycmakeargs=( |
237 |
- -DREVISION=${PV%%_*} |
238 |
- -DENABLE_LLVM_SHARED=ON |
239 |
- -DCMAKE_USE_LIBBPF_PACKAGE=ON |
240 |
- -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}" |
241 |
- -DPYTHON_CMD="${bcc_python_impls%;}" |
242 |
- |
243 |
- ) |
244 |
- if use lua && use lua_single_target_luajit; then |
245 |
- mycmakeargs+=( -DWITH_LUAJIT=1 ) |
246 |
- fi |
247 |
- |
248 |
- cmake_src_configure |
249 |
-} |
250 |
- |
251 |
-src_install() { |
252 |
- cmake_src_install |
253 |
- python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools") |
254 |
- python_foreach_impl python_optimize |
255 |
- |
256 |
- newenvd "${FILESDIR}"/60bcc.env 60bcc.env |
257 |
-} |