summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-11-16 08:57:48 +0100
committerAaron Bauman <bman@gentoo.org>2020-11-20 08:25:46 -0500
commit040b2310a46fb3ce023e2eae0e35def8bd3523da (patch)
treecb6219f6da61b8f4211d9e3f4b7df51b8df35d2e /dev-util
parentgames-roguelike/stone-soup: remove unused patches (diff)
downloadgentoo-040b2310a46fb3ce023e2eae0e35def8bd3523da.tar.gz
gentoo-040b2310a46fb3ce023e2eae0e35def8bd3523da.tar.bz2
gentoo-040b2310a46fb3ce023e2eae0e35def8bd3523da.zip
dev-util/bpftrace: remove unused patch
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18277 Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch148
1 files changed, 0 insertions, 148 deletions
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
deleted file mode 100644
index cf5ed9d76b96..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e89a6a9..efa2ff3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,9 +90,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 a95c60a..f5c4d67 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 4fa0418..4d0c2a9 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,7 +75,8 @@ if (ALLOW_UNSAFE_PROBE)
- target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
- endif(ALLOW_UNSAFE_PROBE)
-
--target_link_libraries(bpftrace arch ast parser resources)
-+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+ bpftraceresources)
-
- target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
- if(STATIC_LINKING)
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 7156276..32faeae 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,10 +1,12 @@
- 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 "x86_64")
-- add_library(arch x86_64.cpp)
-+ add_library(bpftracearch x86_64.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 0d58cd9..e33d585 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
- ast.cpp
- attachpoint_parser.cpp
- codegen_llvm.cpp
-@@ -8,16 +8,17 @@ add_library(ast
- semantic_analyser.cpp
- )
-
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
--target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast arch)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
-+target_link_libraries(bpftraceast bpftracearch)
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- if (HAVE_KFUNC)
-- target_compile_definitions(ast PRIVATE HAVE_KFUNC)
-+ target_compile_definitions(bpftraceast PRIVATE HAVE_KFUNC)
- endif(HAVE_KFUNC)
-
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
-
- if (STATIC_LINKING)
- set(clang_libs
-@@ -41,26 +42,26 @@ if (STATIC_LINKING)
- if(EMBED_LIBCLANG_ONLY)
- unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
- endif()
-- target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-+ target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
- else()
- list(INSERT clang_libs 0 libclang.a)
- endif()
-
- if(EMBED_LLVM)
-- target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+ target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
- else()
- llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
-- 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()
- 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/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 56bcb4a..3f874f8 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -93,7 +93,8 @@ if(HAVE_BFD_DISASM)
- endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
-
--target_link_libraries(bpftrace_test arch ast parser resources)
-+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
-+ bpftraceresources)
-
- target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
- if (STATIC_LINKING)