commit: c3a27f1d619823900583b34c9e5fe304a0efb2e4 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Tue Sep 19 18:31:41 2023 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Tue Sep 19 18:32:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a27f1d
dev-util/bpftrace: drop 0.17.1 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-util/bpftrace/Manifest | 1 - dev-util/bpftrace/bpftrace-0.17.1.ebuild | 97 ------ .../files/bpftrace-0.17.0-install-libs.patch | 329 --------------------- .../bpftrace/files/bpftrace-0.17.0-llvm-16.patch | 26 -- .../files/bpftrace-0.17.0-use-std-optional.patch | 44 --- 5 files changed, 497 deletions(-) diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 198bdcf06805..52e5415f547e 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,4 +1,3 @@ -DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B 5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce SHA512 57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B 921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa SHA512 b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d DIST bpftrace-0.18.1.gh.tar.gz 1046307 BLAKE2B 67c5d586e803c16ae0338563953e86cb3fbf318410f5757824a56fdf049b4b4fe5cc2d2b7e0435c625728b0b25123bcc8d64eaa923c14334d9ec23075c8deeec SHA512 eb81554f4707f8c919930932ff6ec7602578c317c058238a16fe38d6db055da0d7b355733821203281767419aa8e1b2256bb7a921f50c987c85395ecfbda966a DIST bpftrace-0.19.0.gh.tar.gz 1157739 BLAKE2B ebedebe365621436da7735e373dcb142ddad9c8869b8d1c20b227b8cf772b1005d79cec7eef16f7ef7b9f92b9061751986efe43bd102c7592051a549377161bf SHA512 727e1319e8bcb9b197636c2bd3145c1805e0772e268187a1c71979966f28c81e92347606be383f71f922f56df62afea8ac672d5d40fd0338b3687e0520fa3786 diff --git a/dev-util/bpftrace/bpftrace-0.17.1.ebuild b/dev-util/bpftrace/bpftrace-0.17.1.ebuild deleted file mode 100644 index 21b7e21bf0fd..000000000000 --- a/dev-util/bpftrace/bpftrace-0.17.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=16 - -inherit llvm linux-info cmake - -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}.gh.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" - -LICENSE="Apache-2.0" -SLOT="0" - -# remove keywords until build works: -# https://github.com/iovisor/bpftrace/issues/2349 -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="fuzzing test" - -# lots of fixing needed -RESTRICT="test" - -RDEPEND=" - >=dev-libs/libbpf-1.1:= - >=dev-util/bcc-0.25.0:= - >=sys-devel/llvm-10[llvm_targets_BPF(+)] - >=sys-devel/clang-10 - <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=" - app-arch/xz-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig -" - -QA_DT_NEEDED=" - /usr/lib.*/libbpftraceresources.so - /usr/lib.*/libcxxdemangler_llvm.so -" - -PATCHES=( - "${FILESDIR}/bpftrace-0.17.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.17.0-llvm-16.patch" - "${FILESDIR}/bpftrace-0.17.0-use-std-optional.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 mycmakeargs=( - -DSTATIC_LINKING:BOOL=OFF - # bug 809362, 754648 - -DBUILD_TESTING:BOOL=$(usex test) - -DBUILD_FUZZ:BOOL=$(usex fuzzing) - -DENABLE_MAN:BOOL=OFF - -DUSE_SYSTEM_BPF_BCC:BOOL=ON - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - # bug 809362 - dostrip -x /usr/bin/bpftrace - doman man/man8/*.? -} diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch deleted file mode 100644 index 7c14f8f9416e..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch +++ /dev/null @@ -1,329 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0a7914f5..b9d8f47f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,9 +125,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 ce16469a..98161980 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -13,7 +13,7 @@ else() - endif () - endif() - --add_library(runtime -+add_library(bpftraceruntime - attached_probe.cpp - bpffeature.cpp - bpftrace.cpp -@@ -43,7 +43,7 @@ add_library(runtime - ${BFD_DISASM_SRC} - ) - # Ensure flex+bison outputs are built first --add_dependencies(runtime parser) -+add_dependencies(bpftraceruntime bpftraceparser) - - add_library(libbpftrace - build_info.cpp -@@ -60,6 +60,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) -@@ -88,7 +89,7 @@ endif() - set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") - if (KERNEL_HEADERS_DIR) - MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") -- target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") -+ target_compile_definitions(bpftraceruntime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") - endif() - - execute_process( -@@ -108,10 +109,11 @@ endif() - - add_definitions("-DBPFTRACE_VERSION=\"${BPFTRACE_VERSION}\"") - --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}) -+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_BINARY_DIR}) -+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src) -+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) -+target_compile_definitions(bpftraceruntime PRIVATE ${BPFTRACE_FLAGS}) -+install(TARGETS bpftraceruntime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS}) - - # Linking -@@ -124,8 +126,8 @@ if(STATIC_LINKING) - endif(STATIC_LINKING) - - --target_link_libraries(runtime ${LIBBPF_LIBRARIES}) --target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm) -+target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES}) -+target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceruntime aot bpftraceast bpftracearch cxxdemangler_llvm) - - if(LIBPCAP_FOUND) - target_link_libraries(libbpftrace ${LIBPCAP_LIBRARIES}) -@@ -135,37 +137,38 @@ if(HAVE_BFD_DISASM) - if(STATIC_LINKING) - add_library(LIBBFD STATIC IMPORTED) - set_property(TARGET LIBBFD PROPERTY IMPORTED_LOCATION ${LIBBFD_LIBRARIES}) -- target_link_libraries(runtime LIBBFD) -+ target_link_libraries(bpftraceruntime LIBBFD) - add_library(LIBOPCODES STATIC IMPORTED) - set_property(TARGET LIBOPCODES PROPERTY IMPORTED_LOCATION ${LIBOPCODES_LIBRARIES}) -- target_link_libraries(runtime LIBOPCODES) -+ target_link_libraries(bpftraceruntime LIBOPCODES) - add_library(LIBIBERTY STATIC IMPORTED) - set_property(TARGET LIBIBERTY PROPERTY IMPORTED_LOCATION ${LIBIBERTY_LIBRARIES}) -- target_link_libraries(runtime LIBIBERTY) -+ target_link_libraries(bpftraceruntime LIBIBERTY) - else() -- target_link_libraries(runtime ${LIBBFD_LIBRARIES}) -- target_link_libraries(runtime ${LIBOPCODES_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBFD_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBOPCODES_LIBRARIES}) - endif(STATIC_LINKING) - endif(HAVE_BFD_DISASM) - - # Link to bcc libraries (without LLVM) if possible - if(LIBBCC_BPF_CONTAINS_RUNTIME) -- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES}) - else() -- target_link_libraries(runtime ${LIBBCC_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_LIBRARIES}) - endif() - - if(STATIC_BPF_BCC) - # These are not part of the static libbcc so have to be added separate -- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES}) -- target_link_libraries(runtime ${LIBBPF_LIBRARIES}) -- target_link_libraries(runtime ${LIBBCC_LOADER_LIBRARY_STATIC}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_LOADER_LIBRARY_STATIC}) - - add_library(LIBELF STATIC IMPORTED) - set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBELF_LIBRARIES}) -- target_link_libraries(runtime LIBELF) -+ set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBBPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime LIBELF) - else() -- target_link_libraries(runtime ${LIBELF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBELF_LIBRARIES}) - endif(STATIC_BPF_BCC) - - if (LIBDW_FOUND) -@@ -182,16 +185,16 @@ if (LIBDW_FOUND) - set_property(TARGET LIBDW PROPERTY IMPORTED_LOCATION ${LIBDW_LIBRARIES}) - target_link_libraries(LIBDW INTERFACE LIBBZ2 LIBELF LIBLZMA) - -- target_link_libraries(runtime LIBDW) -+ target_link_libraries(bpftraceruntime LIBDW) - else() -- target_link_libraries(runtime ${LIBDW_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBDW_LIBRARIES}) - endif() - endif() - - # Support for std::filesystem - # GCC version <9 and Clang (all versions) require -lstdc++fs - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9") -- target_link_libraries(runtime "stdc++fs") -+ target_link_libraries(bpftraceruntime "stdc++fs") - target_link_libraries(libbpftrace "stdc++fs") - endif() - -@@ -213,16 +216,16 @@ endif() - if (STATIC_LINKING) - if(ANDROID) - target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") -- target_link_libraries(runtime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") -+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") - else() - target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") - target_link_libraries(libbpftrace "-Wl,-Bstatic" "-lz") -- target_link_libraries(runtime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") -- target_link_libraries(runtime "-Wl,-Bstatic" "-lz") -+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") -+ target_link_libraries(bpftraceruntime "-Wl,-Bstatic" "-lz") - endif() - elseif(STATIC_BPF_BCC) - # partial static build, libbpf needs zlib -- target_link_libraries(runtime "-lz") -+ target_link_libraries(bpftraceruntime "-lz") - endif() - - unset(MAIN_SRC) -diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt -index c776d204..41e84317 100644 ---- a/src/aot/CMakeLists.txt -+++ b/src/aot/CMakeLists.txt -@@ -1,8 +1,9 @@ - add_library(aot aot.cpp) --add_dependencies(aot parser) -+add_dependencies(aot bpftraceparser) - 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) -@@ -11,7 +12,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 bpftraceruntime bpftracearch ast_defs cxxdemangler_stdlib) - install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(LIBPCAP_FOUND) -diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt -index d01d1ea3..82bfeccc 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,21 +1,23 @@ - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") -- add_library(arch aarch64.cpp) -+ add_library(bpftracearch aarch64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a") -- add_library(arch arm.cpp) -+ add_library(bpftracearch arm.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) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "loongarch64") -- add_library(arch loongarch64.cpp) -+ add_library(bpftracearch loongarch64.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 c390ea6a..37019bd9 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 - elf_parser.cpp -@@ -21,11 +21,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 parser) -+target_link_libraries(bpftraceast ast_defs bpftracearch 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 -@@ -58,20 +60,20 @@ 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}) - - if(TARGET libclang_static) -- target_link_libraries(ast libclang_static) -+ target_link_libraries(bpftraceast libclang_static) - else() - # old LLVM versions don't export libclang_static in ClangTargets.cmake; fall back to - # libclang.a in that case -- target_link_libraries(ast libclang.a) -+ target_link_libraries(abpftracest libclang.a) - endif() - -- target_link_libraries(ast ${clang_libs}) -- target_link_libraries(ast ${llvm_libs}) -+ target_link_libraries(abpftracest ${clang_libs}) -+ target_link_libraries(abpftracest ${llvm_libs}) - endif() - - if(STATIC_LIBC) -@@ -81,11 +83,11 @@ 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() -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}) diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-llvm-16.patch b/dev-util/bpftrace/files/bpftrace-0.17.0-llvm-16.patch deleted file mode 100644 index 5d845c134bea..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.17.0-llvm-16.patch +++ /dev/null @@ -1,26 +0,0 @@ - -From: https://github.com/iovisor/bpftrace/pull/2528 - -From a91064d7fb26626d79719c2e2a13cc2acab9549a Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 10 Mar 2023 00:08:27 -0800 -Subject: [PATCH] cmake: Raise max llvm major version to 16 - -Signed-off-by: Khem Raj <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0a7914f580d..341ac7e9c1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -165,7 +165,7 @@ else() - endif() - - set(MIN_LLVM_MAJOR 6) -- set(MAX_LLVM_MAJOR 15) -+ set(MAX_LLVM_MAJOR 16) - - if((${LLVM_VERSION_MAJOR} VERSION_LESS ${MIN_LLVM_MAJOR}) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER ${MAX_LLVM_MAJOR})) - message(SEND_ERROR "Unsupported LLVM version found via ${LLVM_INCLUDE_DIRS}: ${LLVM_VERSION_MAJOR}") diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-use-std-optional.patch b/dev-util/bpftrace/files/bpftrace-0.17.0-use-std-optional.patch deleted file mode 100644 index 21b4b7e6c267..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.17.0-use-std-optional.patch +++ /dev/null @@ -1,44 +0,0 @@ - -From: https://github.com/iovisor/bpftrace/pull/2525 - -From a794397394aa836f776da17c8e08876a2f64d477 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 13 Mar 2023 21:30:27 -0700 -Subject: [PATCH] ast: Use std::optional in CodegenLLVM::CodegenLLVM call - -Fixes build with clang-16 - -src/ast/passes/codegen_llvm.cpp:63:53: error: use of undeclared identifier 'Optional'; did you mean 'std::optional'? - -Signed-off-by: Khem Raj <[email protected]> ---- - src/ast/passes/codegen_llvm.cpp | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp -index 616ff89ddbc..fe440adf373 100644 ---- a/src/ast/passes/codegen_llvm.cpp -+++ b/src/ast/passes/codegen_llvm.cpp -@@ -56,11 +56,17 @@ CodegenLLVM::CodegenLLVM(Node *root, BPFtrace &bpftrace) - throw std::runtime_error( - "Could not find bpf llvm target, does your llvm support it?"); - -- target_machine_.reset(target->createTargetMachine(LLVMTargetTriple, -- "generic", -- "", -- TargetOptions(), -- Optional<Reloc::Model>())); -+ target_machine_.reset( -+ target->createTargetMachine(LLVMTargetTriple, -+ "generic", -+ "", -+ TargetOptions(), -+#if LLVM_VERSION_MAJOR >= 16 -+ std::optional<Reloc::Model>() -+#else -+ Optional<Reloc::Model>() -+#endif -+ )); - target_machine_->setOptLevel(llvm::CodeGenOpt::Aggressive); - - module_->setTargetTriple(LLVMTargetTriple);
