| 1 |
commit: b09a22354f2e86e5e2605292b9b6d555699f33f7 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Oct 27 01:18:33 2021 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 27 16:54:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09a2235 |
| 7 |
|
| 8 |
dev-util/bpftrace: Fix patch to make sure libaot is installed |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
...trace-0.14.0-r1.ebuild => bpftrace-0.14.0-r2.ebuild} | 0 |
| 15 |
.../bpftrace/files/bpftrace-0.14.0-install-libs.patch | 17 ++++++++++------- |
| 16 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild |
| 19 |
similarity index 100% |
| 20 |
rename from dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild |
| 21 |
rename to dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild |
| 22 |
|
| 23 |
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch |
| 24 |
index dc8e8905260..2e2484a2efe 100644 |
| 25 |
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch |
| 26 |
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch |
| 27 |
@@ -70,10 +70,18 @@ index 47a050e2..1bbcf882 100644 |
| 28 |
if (LIBBPF_BTF_DUMP_FOUND) |
| 29 |
target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS}) |
| 30 |
diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt |
| 31 |
-index 291d53f2..308691ee 100644 |
| 32 |
+index 291d53f2..22944ddc 100644 |
| 33 |
--- a/src/aot/CMakeLists.txt |
| 34 |
+++ b/src/aot/CMakeLists.txt |
| 35 |
-@@ -10,7 +10,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) |
| 36 |
+@@ -2,6 +2,7 @@ add_library(aot aot.cpp) |
| 37 |
+ target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src) |
| 38 |
+ target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}) |
| 39 |
+ target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS}) |
| 40 |
++install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 41 |
+ |
| 42 |
+ # Only build aotrt if supported bcc is used |
| 43 |
+ # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44) |
| 44 |
+@@ -10,7 +11,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) |
| 45 |
endif() |
| 46 |
|
| 47 |
add_executable(bpftrace-aotrt aot_main.cpp) |
| 48 |
@@ -82,11 +90,6 @@ index 291d53f2..308691ee 100644 |
| 49 |
install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 50 |
|
| 51 |
# Linking |
| 52 |
-@@ -27,3 +27,4 @@ if(BUILD_ASAN) |
| 53 |
- target_compile_options(bpftrace-aotrt PUBLIC "-fsanitize=address") |
| 54 |
- target_link_options(bpftrace-aotrt PUBLIC "-fsanitize=address") |
| 55 |
- endif() |
| 56 |
-+install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 57 |
diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt |
| 58 |
index 76bb217e..4ad0f626 100644 |
| 59 |
--- a/src/arch/CMakeLists.txt |
Archives