1 |
commit: 235bbf5acbfecc780e991834acd4d0fee49ff7a1 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 9 17:11:23 2021 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 9 17:11:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235bbf5a |
7 |
|
8 |
dev-util/bpftrace: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
12 |
|
13 |
dev-util/bpftrace/Manifest | 1 - |
14 |
dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild | 89 ------------ |
15 |
dev-util/bpftrace/bpftrace-0.11.4.ebuild | 86 ------------ |
16 |
dev-util/bpftrace/bpftrace-9999.ebuild | 85 ----------- |
17 |
.../files/bpftrace-0.11.0-install-libs.patch | 156 --------------------- |
18 |
5 files changed, 417 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest |
21 |
index 482103e5556..6f80ffa13ad 100644 |
22 |
--- a/dev-util/bpftrace/Manifest |
23 |
+++ b/dev-util/bpftrace/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
-DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548 SHA512 611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82 |
26 |
DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345 |
27 |
DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B 8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc SHA512 16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0 |
28 |
|
29 |
diff --git a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 76302016ee2..00000000000 |
32 |
--- a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,89 +0,0 @@ |
35 |
-# Copyright 2019-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-inherit toolchain-funcs llvm linux-info cmake |
41 |
- |
42 |
-DESCRIPTION="High-level tracing language for eBPF" |
43 |
-HOMEPAGE="https://github.com/iovisor/bpftrace" |
44 |
- |
45 |
-if [[ ${PV} =~ 9{4,} ]]; then |
46 |
- inherit git-r3 |
47 |
- EGIT_REPO_URI="https://github.com/iovisor/${PN}" |
48 |
- BDEPEND="" |
49 |
-else |
50 |
- MY_PV="${PV//_/}" |
51 |
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
52 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
53 |
- BDEPEND="app-arch/xz-utils " |
54 |
-fi |
55 |
- |
56 |
-LICENSE="Apache-2.0" |
57 |
-SLOT="0" |
58 |
-IUSE="test" |
59 |
- |
60 |
-COMMON_DEPEND=" |
61 |
- dev-util/systemtap |
62 |
- dev-libs/libbpf:= |
63 |
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] |
64 |
- <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] |
65 |
- <=sys-devel/clang-12:= |
66 |
- >=dev-util/bcc-0.13.0:= |
67 |
- virtual/libelf |
68 |
-" |
69 |
-DEPEND="${COMMON_DEPEND} |
70 |
- test? ( dev-cpp/gtest ) |
71 |
-" |
72 |
-RDEPEND="${COMMON_DEPEND}" |
73 |
-BDEPEND+=" |
74 |
- >=dev-util/cmake-3.8 |
75 |
- sys-devel/flex |
76 |
- sys-devel/bison |
77 |
-" |
78 |
- |
79 |
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" |
80 |
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" |
81 |
- |
82 |
-PATCHES=( |
83 |
- "${FILESDIR}/bpftrace-0.11.0-install-libs.patch" |
84 |
- "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" |
85 |
- "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" |
86 |
-) |
87 |
- |
88 |
-# lots of fixing needed |
89 |
-RESTRICT="test" |
90 |
- |
91 |
-# https://bugs.gentoo.org/754648 |
92 |
-RESTRICT+=" strip" |
93 |
- |
94 |
-pkg_pretend() { |
95 |
- local CONFIG_CHECK=" |
96 |
- ~BPF |
97 |
- ~BPF_EVENTS |
98 |
- ~BPF_JIT |
99 |
- ~BPF_SYSCALL |
100 |
- ~FTRACE_SYSCALLS |
101 |
- ~HAVE_EBPF_JIT |
102 |
- " |
103 |
- |
104 |
- check_extra_config |
105 |
-} |
106 |
- |
107 |
-pkg_setup() { |
108 |
- LLVM_MAX_SLOT=11 llvm_pkg_setup |
109 |
-} |
110 |
- |
111 |
-src_prepare() { |
112 |
- cmake_src_prepare |
113 |
-} |
114 |
- |
115 |
-src_configure() { |
116 |
- local -a mycmakeargs |
117 |
- mycmakeargs=( |
118 |
- "-DSTATIC_LINKING:BOOL=OFF" |
119 |
- "-DBUILD_TESTING:BOOL=OFF" |
120 |
- ) |
121 |
- |
122 |
- cmake_src_configure |
123 |
-} |
124 |
|
125 |
diff --git a/dev-util/bpftrace/bpftrace-0.11.4.ebuild b/dev-util/bpftrace/bpftrace-0.11.4.ebuild |
126 |
deleted file mode 100644 |
127 |
index a3a1fb79701..00000000000 |
128 |
--- a/dev-util/bpftrace/bpftrace-0.11.4.ebuild |
129 |
+++ /dev/null |
130 |
@@ -1,86 +0,0 @@ |
131 |
-# Copyright 2019-2020 Gentoo Authors |
132 |
-# Distributed under the terms of the GNU General Public License v2 |
133 |
- |
134 |
-EAPI=7 |
135 |
- |
136 |
-inherit toolchain-funcs llvm linux-info cmake |
137 |
- |
138 |
-DESCRIPTION="High-level tracing language for eBPF" |
139 |
-HOMEPAGE="https://github.com/iovisor/bpftrace" |
140 |
- |
141 |
-if [[ ${PV} =~ 9{4,} ]]; then |
142 |
- inherit git-r3 |
143 |
- EGIT_REPO_URI="https://github.com/iovisor/${PN}" |
144 |
- BDEPEND="" |
145 |
-else |
146 |
- MY_PV="${PV//_/}" |
147 |
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
148 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
149 |
- BDEPEND="app-arch/xz-utils " |
150 |
-fi |
151 |
- |
152 |
-LICENSE="Apache-2.0" |
153 |
-SLOT="0" |
154 |
-IUSE="test" |
155 |
- |
156 |
-COMMON_DEPEND=" |
157 |
- dev-util/systemtap |
158 |
- dev-libs/libbpf:= |
159 |
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] |
160 |
- <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] |
161 |
- <=sys-devel/clang-12:= |
162 |
- >=dev-util/bcc-0.13.0:= |
163 |
- virtual/libelf |
164 |
-" |
165 |
-DEPEND="${COMMON_DEPEND} |
166 |
- test? ( dev-cpp/gtest ) |
167 |
-" |
168 |
-RDEPEND="${COMMON_DEPEND}" |
169 |
-BDEPEND+=" |
170 |
- >=dev-util/cmake-3.8 |
171 |
- sys-devel/flex |
172 |
- sys-devel/bison |
173 |
-" |
174 |
- |
175 |
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" |
176 |
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" |
177 |
- |
178 |
-PATCHES=( |
179 |
- "${FILESDIR}/bpftrace-0.11.0-install-libs.patch" |
180 |
- "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" |
181 |
- "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" |
182 |
-) |
183 |
- |
184 |
-# lots of fixing needed |
185 |
-RESTRICT="test" |
186 |
- |
187 |
-pkg_pretend() { |
188 |
- local CONFIG_CHECK=" |
189 |
- ~BPF |
190 |
- ~BPF_EVENTS |
191 |
- ~BPF_JIT |
192 |
- ~BPF_SYSCALL |
193 |
- ~FTRACE_SYSCALLS |
194 |
- ~HAVE_EBPF_JIT |
195 |
- " |
196 |
- |
197 |
- check_extra_config |
198 |
-} |
199 |
- |
200 |
-pkg_setup() { |
201 |
- LLVM_MAX_SLOT=11 llvm_pkg_setup |
202 |
-} |
203 |
- |
204 |
-src_prepare() { |
205 |
- cmake_src_prepare |
206 |
-} |
207 |
- |
208 |
-src_configure() { |
209 |
- local -a mycmakeargs |
210 |
- mycmakeargs=( |
211 |
- "-DSTATIC_LINKING:BOOL=OFF" |
212 |
- "-DBUILD_TESTING:BOOL=OFF" |
213 |
- ) |
214 |
- |
215 |
- cmake_src_configure |
216 |
-} |
217 |
|
218 |
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild |
219 |
deleted file mode 100644 |
220 |
index 2a14dc58476..00000000000 |
221 |
--- a/dev-util/bpftrace/bpftrace-9999.ebuild |
222 |
+++ /dev/null |
223 |
@@ -1,85 +0,0 @@ |
224 |
-# Copyright 2019-2020 Gentoo Authors |
225 |
-# Distributed under the terms of the GNU General Public License v2 |
226 |
- |
227 |
-EAPI=7 |
228 |
- |
229 |
-inherit toolchain-funcs llvm linux-info cmake |
230 |
- |
231 |
-DESCRIPTION="High-level tracing language for eBPF" |
232 |
-HOMEPAGE="https://github.com/iovisor/bpftrace" |
233 |
- |
234 |
-if [[ ${PV} =~ 9{4,} ]]; then |
235 |
- inherit git-r3 |
236 |
- EGIT_REPO_URI="https://github.com/iovisor/${PN}" |
237 |
- BDEPEND="" |
238 |
-else |
239 |
- MY_PV="${PV//_/}" |
240 |
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
241 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
242 |
- BDEPEND="app-arch/xz-utils " |
243 |
-fi |
244 |
- |
245 |
-LICENSE="Apache-2.0" |
246 |
-SLOT="0" |
247 |
-IUSE="test" |
248 |
- |
249 |
-COMMON_DEPEND=" |
250 |
- dev-util/systemtap |
251 |
- <dev-libs/libbpf-0.2:= |
252 |
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] |
253 |
- <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] |
254 |
- <=sys-devel/clang-12:= |
255 |
- >=dev-util/bcc-0.13.0:= |
256 |
- virtual/libelf |
257 |
-" |
258 |
-DEPEND="${COMMON_DEPEND} |
259 |
- test? ( dev-cpp/gtest ) |
260 |
-" |
261 |
-RDEPEND="${COMMON_DEPEND}" |
262 |
-BDEPEND+=" |
263 |
- >=dev-util/cmake-3.8 |
264 |
- sys-devel/flex |
265 |
- sys-devel/bison |
266 |
-" |
267 |
- |
268 |
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" |
269 |
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" |
270 |
- |
271 |
-PATCHES=( |
272 |
- "${FILESDIR}/bpftrace-0.11.0-install-libs.patch" |
273 |
- "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" |
274 |
-) |
275 |
- |
276 |
-# lots of fixing needed |
277 |
-RESTRICT="test" |
278 |
- |
279 |
-pkg_pretend() { |
280 |
- local CONFIG_CHECK=" |
281 |
- ~BPF |
282 |
- ~BPF_EVENTS |
283 |
- ~BPF_JIT |
284 |
- ~BPF_SYSCALL |
285 |
- ~FTRACE_SYSCALLS |
286 |
- ~HAVE_EBPF_JIT |
287 |
- " |
288 |
- |
289 |
- check_extra_config |
290 |
-} |
291 |
- |
292 |
-pkg_setup() { |
293 |
- LLVM_MAX_SLOT=11 llvm_pkg_setup |
294 |
-} |
295 |
- |
296 |
-src_prepare() { |
297 |
- cmake_src_prepare |
298 |
-} |
299 |
- |
300 |
-src_configure() { |
301 |
- local -a mycmakeargs |
302 |
- mycmakeargs=( |
303 |
- "-DSTATIC_LINKING:BOOL=OFF" |
304 |
- "-DBUILD_TESTING:BOOL=OFF" |
305 |
- ) |
306 |
- |
307 |
- cmake_src_configure |
308 |
-} |
309 |
|
310 |
diff --git a/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch |
311 |
deleted file mode 100644 |
312 |
index a28e37564ea..00000000000 |
313 |
--- a/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch |
314 |
+++ /dev/null |
315 |
@@ -1,156 +0,0 @@ |
316 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
317 |
-index 1bca8d6..1482b29 100644 |
318 |
---- a/CMakeLists.txt |
319 |
-+++ b/CMakeLists.txt |
320 |
-@@ -91,9 +91,10 @@ find_package(FLEX REQUIRED) |
321 |
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE) |
322 |
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc) |
323 |
- add_flex_bison_dependency(flex_lexer bison_parser) |
324 |
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) |
325 |
--target_compile_options(parser PRIVATE "-w") |
326 |
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) |
327 |
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) |
328 |
-+target_compile_options(bpftraceparser PRIVATE "-w") |
329 |
-+target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) |
330 |
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
331 |
- |
332 |
- include(CheckSymbolExists) |
333 |
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) |
334 |
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt |
335 |
-index a95c60a..f5c4d67 100644 |
336 |
---- a/resources/CMakeLists.txt |
337 |
-+++ b/resources/CMakeLists.txt |
338 |
-@@ -1,6 +1,7 @@ |
339 |
--add_library(resources headers.cpp) |
340 |
-+add_library(bpftraceresources headers.cpp) |
341 |
- |
342 |
--target_include_directories(resources PUBLIC ../src) |
343 |
-+target_include_directories(bpftraceresources PUBLIC ../src) |
344 |
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
345 |
- |
346 |
- function(embed_headers output) |
347 |
- file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n") |
348 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
349 |
-index 487fa9b..61b7b38 100644 |
350 |
---- a/src/CMakeLists.txt |
351 |
-+++ b/src/CMakeLists.txt |
352 |
-@@ -84,7 +84,8 @@ if (ALLOW_UNSAFE_PROBE) |
353 |
- target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE) |
354 |
- endif(ALLOW_UNSAFE_PROBE) |
355 |
- |
356 |
--target_link_libraries(bpftrace arch ast parser resources) |
357 |
-+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser |
358 |
-+ bpftraceresources) |
359 |
- |
360 |
- target_link_libraries(bpftrace ${LIBBCC_LIBRARIES}) |
361 |
- if(STATIC_LINKING) |
362 |
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt |
363 |
-index a26c1c8..ffb5900 100644 |
364 |
---- a/src/arch/CMakeLists.txt |
365 |
-+++ b/src/arch/CMakeLists.txt |
366 |
-@@ -1,13 +1,15 @@ |
367 |
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") |
368 |
-- add_library(arch aarch64.cpp) |
369 |
-+ add_library(bpftracearch aarch64.cpp) |
370 |
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR |
371 |
- CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") |
372 |
-- add_library(arch ppc64.cpp) |
373 |
-+ add_library(bpftracearch ppc64.cpp) |
374 |
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR |
375 |
- CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") |
376 |
-- add_library(arch s390.cpp) |
377 |
-+ add_library(bpftracearch s390.cpp) |
378 |
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") |
379 |
-- add_library(arch x86_64.cpp) |
380 |
-+ add_library(bpftracearch x86_64.cpp) |
381 |
- else() |
382 |
- message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") |
383 |
- endif() |
384 |
-+ |
385 |
-+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
386 |
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt |
387 |
-index 649bf0a..b969b9c 100644 |
388 |
---- a/src/ast/CMakeLists.txt |
389 |
-+++ b/src/ast/CMakeLists.txt |
390 |
-@@ -1,4 +1,4 @@ |
391 |
--add_library(ast |
392 |
-+add_library(bpftraceast |
393 |
- ast.cpp |
394 |
- attachpoint_parser.cpp |
395 |
- codegen_llvm.cpp |
396 |
-@@ -7,17 +7,18 @@ add_library(ast |
397 |
- printer.cpp |
398 |
- semantic_analyser.cpp |
399 |
- ) |
400 |
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
401 |
- |
402 |
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src) |
403 |
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) |
404 |
--target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR}) |
405 |
--target_link_libraries(ast arch) |
406 |
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src) |
407 |
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) |
408 |
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR}) |
409 |
-+target_link_libraries(bpftraceast bpftracearch) |
410 |
- |
411 |
- if (HAVE_BCC_KFUNC) |
412 |
-- target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC) |
413 |
-+ target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC) |
414 |
- endif(HAVE_BCC_KFUNC) |
415 |
- |
416 |
--add_dependencies(ast parser) |
417 |
-+add_dependencies(bpftraceast bpftraceparser) |
418 |
- |
419 |
- if (STATIC_LINKING) |
420 |
- set(clang_libs |
421 |
-@@ -41,17 +42,17 @@ if (STATIC_LINKING) |
422 |
- if(EMBED_LIBCLANG_ONLY) |
423 |
- unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM") |
424 |
- endif() |
425 |
-- target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS}) |
426 |
-+ target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS}) |
427 |
- else() |
428 |
- list(INSERT clang_libs 0 libclang.a) |
429 |
- endif() |
430 |
- |
431 |
- if(EMBED_LLVM) |
432 |
-- target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS}) |
433 |
-+ target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS}) |
434 |
- else() |
435 |
- llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit option orcjit ${LLVM_TARGETS_TO_BUILD}) |
436 |
-- target_link_libraries(ast ${clang_libs}) |
437 |
-- target_link_libraries(ast ${llvm_libs}) |
438 |
-+ target_link_libraries(bpftraceast ${clang_libs}) |
439 |
-+ target_link_libraries(bpftraceast ${llvm_libs}) |
440 |
- endif() |
441 |
- |
442 |
- if(STATIC_LIBC) |
443 |
-@@ -60,11 +61,11 @@ if (STATIC_LINKING) |
444 |
- else() |
445 |
- find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS}) |
446 |
- if(found_LLVM) |
447 |
-- target_link_libraries(ast LLVM) |
448 |
-+ target_link_libraries(bpftraceast LLVM) |
449 |
- else() |
450 |
- llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD}) |
451 |
- llvm_expand_dependencies(llvm_libs ${_llvm_libs}) |
452 |
-- target_link_libraries(ast ${llvm_libs}) |
453 |
-+ target_link_libraries(bpftraceast ${llvm_libs}) |
454 |
- endif() |
455 |
-- target_link_libraries(ast libclang) |
456 |
-+ target_link_libraries(bpftraceast libclang) |
457 |
- endif() |
458 |
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
459 |
-index 4104a57..59486de 100644 |
460 |
---- a/tests/CMakeLists.txt |
461 |
-+++ b/tests/CMakeLists.txt |
462 |
-@@ -101,7 +101,8 @@ if(HAVE_BFD_DISASM) |
463 |
- endif(STATIC_LINKING) |
464 |
- endif(HAVE_BFD_DISASM) |
465 |
- |
466 |
--target_link_libraries(bpftrace_test arch ast parser resources) |
467 |
-+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser |
468 |
-+ bpftraceresources) |
469 |
- |
470 |
- target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES}) |
471 |
- if (STATIC_LINKING) |