diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-util/bpftrace | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-util/bpftrace')
-rw-r--r-- | dev-util/bpftrace/Manifest | 7 | ||||
-rw-r--r-- | dev-util/bpftrace/bpftrace-0.14.1.ebuild | 92 | ||||
-rw-r--r-- | dev-util/bpftrace/bpftrace-0.15.0.ebuild (renamed from dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild) | 12 | ||||
-rw-r--r-- | dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch | 47 | ||||
-rw-r--r-- | dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch | 199 |
5 files changed, 254 insertions, 103 deletions
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index dca663f76d7c..5c1666c6ec36 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -4,8 +4,9 @@ AUX bpftrace-0.14-libbpf-0.6.patch 619 BLAKE2B 5873130d6d9c58878b1b089c28d370175 AUX bpftrace-0.14.0-dont-compress-man.patch 1760 BLAKE2B dc07764635e845729e684b0817ccda599824481b7a60f7b89f8a18081fedf84b003ffb06c0cd8c289d8100c58e9fb7959174a3cbd165f485169ecea38a9f19cb SHA512 386a4d6cd46973db42c43f6790ffda165b8697feb576d14e95631a2f1bb26aca37c67ae0ee6f09be5983aa292653dac496a1f207de5e36dfcf986bb78b614bb1 AUX bpftrace-0.14.0-fuzzing.patch 499 BLAKE2B 3dfbc2594676c37c239c92c94b475cbfa9b30ff785bba436e0cf5729deac51c7f10826ddb9603f02bd39645af626e0aa2565b46ac79ede40d936203def321391 SHA512 bf2a3569097274a46e5ed9fe8ea014ae3a0c9f42684e56b948cd6ec458e022d98aaecaac7577150e3a78c81583e678fbfa0f798c342e827ea7af9a4c2b128f0f AUX bpftrace-0.14.0-install-libs.patch 8077 BLAKE2B ae165fd4eceae5d159d28b9a0fb29e8c12dd565c127984469ad55675e115f48ae0de471ddb3b88699560472e63f0fd4fef187708d722f5e42e749f0cbe066ae1 SHA512 3664a93d9ab6f824ea2c7689020287a8cc3da45c27a146a3301394e5adbde56a899727d7fd15d912dd7b2ba8e9c84508e4c5b563d551e7315ec05c1f9eddfc7d +AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511 +AUX bpftrace-0.15.0-install-libs.patch 8206 BLAKE2B 9d8b193f422b0ee64301b7ea12791afdd5111cde487b904ec35750e6189fdd6faca9af36b8956058c820c2398bcabc7dcee6d26b93c55ff1e591b3259a682a27 SHA512 9721d8f3812855d7a9155d8e5ecac305dedb5c8326ccf8ea679048f920ca58a774576840c1b0bc2864a26c66c89bf0c81ed1a1ab30fb571a6cfaebc5b499c2b7 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614 -DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B 832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1 SHA512 0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73 -EBUILD bpftrace-0.14.1-r1.ebuild 2030 BLAKE2B f49d22af172a2469ed006d2ddacde845728f41b2743b6c2b61d7d4c7f15ef8ab42636a7e9926432d30229919d0a3f746fe7d3963a8bf935742f145784574efeb SHA512 f1ced97c2196e36c62f4364d61c879fb79d32405bcd4190f9e1a6f668f23f7a23b0ef13484cd2aa51b7fc2852005a7a450b0ea8825afc3946554ad990199e1c4 -EBUILD bpftrace-0.14.1.ebuild 1904 BLAKE2B 1ee8a2235c547e6f513070baafc7bd2063934dcbe3e77612f14b42e92a14f31aacf89b26d927a776f840acb225cd3fddf24532230740799a022de6fa7b6f492b SHA512 e6a6dbaeff403928f9f4e90b1875bccb4c894c9e418159a01c613698b090a41a38463fd3046e171fd660e0ce526d9dcc1f53b8b3251a0ce020f32781cdc44e45 +DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a +EBUILD bpftrace-0.15.0.ebuild 1851 BLAKE2B 29ec8eeb90ec974e7ad54ad64fb5cc652fea32534dab661b34567a2a9a3e2ca6f642fc2916d59dd8ab3df501ac6927a2a68358ceea2d4dbcd29902ed9d60e29e SHA512 42cbc3baa5a14d421941bae00b300ded638b76809b60cfe8751610b5e8523327c30b209a2e94dbbd1f7a81e610b52b141b6940a3d9be2792d0ab4094bd2a7352 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild b/dev-util/bpftrace/bpftrace-0.14.1.ebuild deleted file mode 100644 index 91157b21ad7e..000000000000 --- a/dev-util/bpftrace/bpftrace-0.14.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LLVM_MAX_SLOT=13 - -inherit llvm linux-info cmake toolchain-funcs - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace" -MY_PV="${PV//_/}" -SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="fuzzing test" -# lots of fixing needed -RESTRICT="test" - -RDEPEND=" - dev-libs/libbpf:= - >=dev-util/bcc-0.13.0:= - dev-util/systemtap - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] - sys-libs/binutils-libs:= - virtual/libelf:= -" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/cereal:= - test? ( dev-cpp/gtest ) -" -BDEPEND=" - sys-apps/sed - app-arch/xz-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.14.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.14.0-fuzzing.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch" - "${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch" -) - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - llvm_pkg_setup -} - -src_configure() { - local -a mycmakeargs=( - -DSTATIC_LINKING:BOOL=OFF - # bug 809362, 754648 - -DBUILD_SHARED_LIBS:=OFF - -DBUILD_TESTING:BOOL=OFF - -DBUILD_FUZZ:BOOL=$(usex fuzzing) - -DENABLE_MAN:BOOL=OFF - -DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - # bug 809362 - dostrip -x /usr/bin/bpftrace - doman man/man8/*.? -} diff --git a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild b/dev-util/bpftrace/bpftrace-0.15.0.ebuild index f8e1dddbd01e..cb4b8281e70b 100644 --- a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild +++ b/dev-util/bpftrace/bpftrace-0.15.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LLVM_MAX_SLOT=14 +LLVM_MAX_SLOT=15 inherit llvm linux-info cmake toolchain-funcs @@ -24,7 +24,7 @@ IUSE="fuzzing test" RESTRICT="test" RDEPEND=" - dev-libs/libbpf:= + >=dev-libs/libbpf-0.8:= >=dev-util/bcc-0.13.0:= dev-util/systemtap <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= @@ -48,13 +48,9 @@ BDEPEND=" QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" PATCHES=( - "${FILESDIR}/bpftrace-0.14.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.14.0-fuzzing.patch" + "${FILESDIR}/bpftrace-0.15.0-install-libs.patch" + "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch" - "${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch" - "${WORKDIR}/bpftrace-0.14.1-llvm14.patch" ) pkg_pretend() { diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch new file mode 100644 index 000000000000..84241e052462 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch @@ -0,0 +1,47 @@ +diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt +index 1a81dee0..c93ccbd2 100644 +--- a/man/adoc/CMakeLists.txt ++++ b/man/adoc/CMakeLists.txt +@@ -1,7 +1,5 @@ +-find_program(GZIP gzip REQUIRED) + find_program(ASCIIDOCTOR asciidoctor) + file(GLOB FILES *.adoc) +-set(GZFILES "") + if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND") + foreach(FIL ${FILES}) + get_filename_component(NAME ${FIL} NAME_WE) +@@ -12,14 +10,9 @@ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND") + COMMAND ${ASCIIDOCTOR} ${FIL} -b manpage -o - > ${MANPAGE_FILE} + DEPENDS ${FIL}) + +- add_custom_command(OUTPUT ${GZ_MANPAGE_FILE} +- COMMAND ${GZIP} -c ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE} +- DEPENDS ${MANPAGE_FILE}) +- +- list(APPEND GZFILES ${GZ_MANPAGE_FILE}) + endforeach() +- add_custom_target(adoc_man DEPENDS ${GZFILES}) +- install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) ++ add_custom_target(adoc_man DEPENDS ${FILES}) ++ install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) + else() + message(WARNING "asciidoctor not found, building without bpftrace manpage") + add_custom_target(adoc_man) +diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt +index 2a316cd9..2207cf80 100644 +--- a/man/man8/CMakeLists.txt ++++ b/man/man8/CMakeLists.txt +@@ -1,12 +1,3 @@ +-find_program(GZIP gzip REQUIRED) + file(GLOB FILES *.8) +-set(GZFILES "") +-foreach(FIL ${FILES}) +- get_filename_component(NAME ${FIL} NAME) +- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz +- COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz +- DEPENDS ${FIL}) +- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz") +-endforeach() + add_custom_target(man_man DEPENDS ${GZFILES}) +-install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) ++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch new file mode 100644 index 000000000000..b20e39e4d268 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch @@ -0,0 +1,199 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5c4c396..4bc3e499 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,9 +103,10 @@ find_package(FLEX REQUIRED) + bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE) + flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc) + add_flex_bison_dependency(flex_lexer bison_parser) +-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) +-target_compile_options(parser PRIVATE "-w") +-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) ++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) ++target_compile_options(bpftraceparser PRIVATE "-w") ++target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) ++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + include(CheckSymbolExists) + set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index a95c60a1..f5c4d676 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -1,6 +1,7 @@ +-add_library(resources headers.cpp) ++add_library(bpftraceresources headers.cpp) + +-target_include_directories(resources PUBLIC ../src) ++target_include_directories(bpftraceresources PUBLIC ../src) ++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + function(embed_headers output) + file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 66a7fd66..738d9327 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -41,7 +41,7 @@ add_library(runtime + ${BFD_DISASM_SRC} + ) + # Ensure flex+bison outputs are built first +-add_dependencies(runtime parser) ++add_dependencies(runtime bpftraceparser) + + add_library(libbpftrace + build_info.cpp +@@ -58,6 +58,7 @@ add_executable(${BPFTRACE} + ) + + install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + target_link_libraries(${BPFTRACE} libbpftrace) + + if (BUILD_FUZZ) +@@ -110,6 +111,7 @@ target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR}) + target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src) + target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) + target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS}) ++install(TARGETS runtime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS}) + + # Linking +@@ -122,7 +124,8 @@ if(STATIC_LINKING) + endif(STATIC_LINKING) + + +-target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm) ++target_link_libraries(libbpftrace bpftraceparser bpftraceresources ++ runtime aot bpftraceast bpftracearch cxxdemangler_llvm) + + if (LIBBPF_BTF_DUMP_FOUND) + target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS}) +diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt +index 291d53f2..22944ddc 100644 +--- a/src/aot/CMakeLists.txt ++++ b/src/aot/CMakeLists.txt +@@ -2,6 +2,7 @@ add_library(aot aot.cpp) + target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src) + target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}) + target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS}) ++install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Only build aotrt if supported bcc is used + # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44) +@@ -10,7 +11,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) + endif() + + add_executable(bpftrace-aotrt aot_main.cpp) +-target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs cxxdemangler_stdlib) ++target_link_libraries(bpftrace-aotrt aot runtime bpftracearch ast_defs cxxdemangler_stdlib) + install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) + + # Linking +diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt +index 127c3528..4e05d40a 100644 +--- a/src/arch/CMakeLists.txt ++++ b/src/arch/CMakeLists.txt +@@ -1,17 +1,19 @@ + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- add_library(arch aarch64.cpp) ++ add_library(bpftracearch aarch64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR + CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") +- add_library(arch ppc64.cpp) ++ add_library(bpftracearch ppc64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR + CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") +- add_library(arch s390.cpp) ++ add_library(bpftracearch s390.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- add_library(arch x86_64.cpp) ++ add_library(bpftracearch x86_64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64") +- add_library(arch mips64.cpp) ++ add_library(bpftracearch mips64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") +- add_library(arch riscv64.cpp) ++ add_library(bpftracearch riscv64.cpp) + else() + message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") + endif() ++ ++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt +index 014295cd..c35f6ac6 100644 +--- a/src/ast/CMakeLists.txt ++++ b/src/ast/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_library(ast_defs ast.cpp) + +-add_library(ast ++add_library(bpftraceast + async_event_types.cpp + attachpoint_parser.cpp + int_parser.cpp +@@ -20,11 +20,13 @@ add_library(ast + target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src) + target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) + target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR}) +-target_link_libraries(ast ast_defs arch bpforc parser) ++target_link_libraries(bpftraceast ast_defs bpftracearch bpforc bpftraceparser) ++install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +-add_dependencies(ast_defs parser) ++add_dependencies(ast_defs bpftraceparser) + +-target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS}) ++target_compile_definitions(bpftraceast PRIVATE ${BPFTRACE_FLAGS}) + + if (STATIC_LINKING) + set(clang_libs +@@ -55,11 +57,11 @@ if (STATIC_LINKING) + + + if(EMBED_USE_LLVM) +- target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") ++ target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") + else() + llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names}) +- target_link_libraries(ast ${clang_libs}) +- target_link_libraries(ast ${llvm_libs}) ++ target_link_libraries(bpftraceast ${clang_libs}) ++ target_link_libraries(bpftraceast ${llvm_libs}) + endif() + + if(STATIC_LIBC) +@@ -69,13 +71,13 @@ if (STATIC_LINKING) + else() + find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS}) + if(found_LLVM) +- target_link_libraries(ast LLVM) ++ target_link_libraries(bpftraceast LLVM) + else() + llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD}) + llvm_expand_dependencies(llvm_libs ${_llvm_libs}) +- target_link_libraries(ast ${llvm_libs}) ++ target_link_libraries(bpftraceast ${llvm_libs}) + endif() +- target_link_libraries(ast libclang) ++ target_link_libraries(bpftraceast libclang) + endif() + + add_subdirectory(bpforc) +diff --git a/src/ast/bpforc/CMakeLists.txt b/src/ast/bpforc/CMakeLists.txt +index 3f6dbefa..8ccfbb2b 100644 +--- a/src/ast/bpforc/CMakeLists.txt ++++ b/src/ast/bpforc/CMakeLists.txt +@@ -1 +1,2 @@ + add_library(bpforc bpforc.cpp) ++install(TARGETS bpforc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/src/cxxdemangler/CMakeLists.txt b/src/cxxdemangler/CMakeLists.txt +index 04cfcdd9..5677aa4b 100644 +--- a/src/cxxdemangler/CMakeLists.txt ++++ b/src/cxxdemangler/CMakeLists.txt +@@ -1,2 +1,4 @@ + add_library(cxxdemangler_stdlib cxxdemangler_stdlib.cpp) + add_library(cxxdemangler_llvm cxxdemangler_llvm.cpp) ++install(TARGETS cxxdemangler_stdlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS cxxdemangler_llvm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |