From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- dev-util/bcc/Manifest | 1 - dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch | 182 ---------------------- 2 files changed, 183 deletions(-) delete mode 100644 dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch (limited to 'dev-util/bcc') diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 016a04df8033..06b6e7f5c493 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -1,4 +1,3 @@ -AUX bcc-0.10.0-system-libbpf.patch 7201 BLAKE2B c2018dfc9709c6bbf3ea041eec9f731ab3055131558f9fcf07423c06e22a881eac8b6cff757ac3637cd0c12af878a8aaf2f1a13bc0cf859ae23eee75c3e635da SHA512 330d4c69b551fb0e066adc9676358dad4fc75a75cf6e7898a364fa379172829ba6a494aafe82e094218d3cef249e791c89d6a48ebea250597b3b61d0ac7a5f47 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979 AUX bcc-0.9.0-system-libbpf.patch 3629 BLAKE2B e3fd70ccd29126bd2ac8582d8094ef0317dbc9dafc8924a05d994105573a6bd1bf382cbd3d6a0bb25390abc3b4ca3edc70293f4663337ccc203434ba380648dd SHA512 e7ca33a66ffbe4cb4b4bf169029d2325b4321018832803872a7fc7f1e99a75338e34bfe55a072f717d45f9759adf119ed5289f0febd45f81303c178999ef5dc7 DIST bcc-0.10.0.tar.gz 2052430 BLAKE2B 562aa95d34ba329ce966bca3164af45fe6d78487e5f0d370a0a90c5d91af75b4adcc5aa1e6578bf598e55dc51394c5a218fc19e2b57b2f7241cc3fe1f3a4e513 SHA512 92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235 diff --git a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch b/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch deleted file mode 100644 index fabb3f3f2e63..000000000000 --- a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94aac856..bd454226 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,12 +9,6 @@ endif() - - enable_testing() - --# populate submodules (libbpf) --if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src) -- execute_process(COMMAND git submodule update --init --recursive -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) --endif() -- - include(cmake/GetGitRevisionDescription.cmake) - include(cmake/version.cmake) - include(CMakeDependentOption) -@@ -61,6 +55,9 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS}) - include_directories("${DIR}/../tools/clang/include") - ENDFOREACH() - -+find_package(PkgConfig) -+pkg_check_modules(LIBBPF REQUIRED libbpf) -+ - # Set to a string path if system places kernel lib directory in - # non-default location. - if(NOT DEFINED BCC_KERNEL_MODULES_DIR) -diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt -index 906c9aaf..210f0f75 100644 ---- a/examples/cpp/CMakeLists.txt -+++ b/examples/cpp/CMakeLists.txt -@@ -3,7 +3,7 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - option(INSTALL_CPP_EXAMPLES "Install C++ examples. Those binaries are statically linked and can take plenty of disk space" OFF) - -diff --git a/examples/cpp/pyperf/CMakeLists.txt b/examples/cpp/pyperf/CMakeLists.txt -index 6f963c66..e8dd66f6 100644 ---- a/examples/cpp/pyperf/CMakeLists.txt -+++ b/examples/cpp/pyperf/CMakeLists.txt -@@ -3,7 +3,7 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - add_executable(PyPerf PyPerf.cc PyPerfUtil.cc PyPerfBPFProgram.cc PyPerfLoggingHelper.cc PyPerfDefaultPrinter.cc Py36Offsets.cc) - target_link_libraries(PyPerf bcc-static) -diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt -index 88df6e84..de8a6464 100644 ---- a/introspection/CMakeLists.txt -+++ b/introspection/CMakeLists.txt -@@ -3,11 +3,11 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON) - - add_executable(bps bps.c) --target_link_libraries(bps bpf-static) -+target_link_libraries(bps ${LIBBPF_LIBRARIES}) - - install (TARGETS bps DESTINATION share/bcc/introspection) -diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt -index bd34fd48..dfbeb596 100644 ---- a/src/cc/CMakeLists.txt -+++ b/src/cc/CMakeLists.txt -@@ -10,8 +10,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang) - include_directories(${LLVM_INCLUDE_DIRS}) - include_directories(${LIBELF_INCLUDE_DIRS}) - # todo: if check for kernel version --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include) --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - add_definitions(${LLVM_DEFINITIONS}) - configure_file(libbcc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc @ONLY) - -@@ -28,13 +27,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}") - - include(static_libstdc++) - --file(GLOB libbpf_sources "libbpf/src/*.c") --add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources}) --set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf) --add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources}) --set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0) --set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf) -- - set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc exported_files.cc) - if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6) - set(bcc_common_sources ${bcc_common_sources} bcc_debug.cc) -@@ -79,12 +71,12 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f - - # bcc_common_libs_for_a for archive libraries - # bcc_common_libs_for_s for shared libraries --set(bcc_common_libs_for_a b_frontend clang_frontend bpf-static -+set(bcc_common_libs_for_a b_frontend clang_frontend - -Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive -- ${LIBELF_LIBRARIES}) -+ ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES}) - set(bcc_common_libs_for_s ${bcc_common_libs_for_a}) --set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static -- ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES}) -+set(bcc_common_libs_for_lua b_frontend clang_frontend -+ ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES}) - - if(ENABLE_CPP_API) - add_subdirectory(api) -@@ -111,8 +103,7 @@ set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua}) - install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${bcc_table_headers} DESTINATION include/bcc) - install(FILES ${bcc_api_headers} DESTINATION include/bcc) --install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h") -+#install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif(ENABLE_CLANG_JIT) - install(FILES ${bcc_common_headers} DESTINATION include/bcc) --install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc -index 12816757..29e4c707 100644 ---- a/src/cc/bcc_btf.cc -+++ b/src/cc/bcc_btf.cc -@@ -19,8 +19,8 @@ - #include - #include "linux/btf.h" - #include "libbpf.h" --#include "libbpf/src/libbpf.h" --#include "libbpf/src/btf.h" -+#include -+#include - #include - - #define BCC_MAX_ERRNO 4095 -diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc -index 836c458f..eb03ce59 100644 ---- a/src/cc/bpf_module.cc -+++ b/src/cc/bpf_module.cc -@@ -43,7 +43,7 @@ - #include "exported_files.h" - #include "libbpf.h" - #include "bcc_btf.h" --#include "libbpf/src/bpf.h" -+#include - - namespace ebpf { - -diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c -index 63f4894e..83147dbe 100644 ---- a/src/cc/libbpf.c -+++ b/src/cc/libbpf.c -@@ -52,8 +52,8 @@ - // TODO: Remove this when CentOS 6 support is not needed anymore - #include "setns.h" - --#include "libbpf/src/bpf.h" --#include "libbpf/src/libbpf.h" -+#include -+#include - - // TODO: remove these defines when linux-libc-dev exports them properly - -diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt -index a47abe14..ae710eb4 100644 ---- a/tests/cc/CMakeLists.txt -+++ b/tests/cc/CMakeLists.txt -@@ -3,7 +3,7 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - add_executable(test_static test_static.c) - target_link_libraries(test_static bcc-static) -- cgit v1.2.3