| 1 |
commit: 83059a7de54913700cdfe7d36391673c1b7ebcc9 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Tue Oct 26 22:05:35 2021 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 26 22:07:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83059a7d |
| 7 |
|
| 8 |
dev-util/bpftrace: bump fix install of ast lib (bug # 784332) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784332 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{bpftrace-0.14.0.ebuild => bpftrace-0.14.0-r1.ebuild} | 0 |
| 16 |
dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch | 9 +++++---- |
| 17 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/bpftrace/bpftrace-0.14.0.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild |
| 20 |
similarity index 100% |
| 21 |
rename from dev-util/bpftrace/bpftrace-0.14.0.ebuild |
| 22 |
rename to dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild |
| 23 |
|
| 24 |
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 |
| 25 |
index 00d35c6f49e..dc8e8905260 100644 |
| 26 |
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch |
| 27 |
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch |
| 28 |
@@ -115,7 +115,7 @@ index 76bb217e..4ad0f626 100644 |
| 29 |
+ |
| 30 |
+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 31 |
diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt |
| 32 |
-index 014295cd..b038aa18 100644 |
| 33 |
+index 014295cd..c35f6ac6 100644 |
| 34 |
--- a/src/ast/CMakeLists.txt |
| 35 |
+++ b/src/ast/CMakeLists.txt |
| 36 |
@@ -1,6 +1,6 @@ |
| 37 |
@@ -126,13 +126,14 @@ index 014295cd..b038aa18 100644 |
| 38 |
async_event_types.cpp |
| 39 |
attachpoint_parser.cpp |
| 40 |
int_parser.cpp |
| 41 |
-@@ -20,11 +20,12 @@ add_library(ast |
| 42 |
+@@ -20,11 +20,13 @@ add_library(ast |
| 43 |
target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src) |
| 44 |
target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) |
| 45 |
target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR}) |
| 46 |
-target_link_libraries(ast ast_defs arch bpforc parser) |
| 47 |
+target_link_libraries(bpftraceast ast_defs bpftracearch bpforc bpftraceparser) |
| 48 |
+install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 49 |
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 50 |
|
| 51 |
-add_dependencies(ast_defs parser) |
| 52 |
+add_dependencies(ast_defs bpftraceparser) |
| 53 |
@@ -142,7 +143,7 @@ index 014295cd..b038aa18 100644 |
| 54 |
|
| 55 |
if (STATIC_LINKING) |
| 56 |
set(clang_libs |
| 57 |
-@@ -55,11 +56,11 @@ if (STATIC_LINKING) |
| 58 |
+@@ -55,11 +57,11 @@ if (STATIC_LINKING) |
| 59 |
|
| 60 |
|
| 61 |
if(EMBED_USE_LLVM) |
| 62 |
@@ -157,7 +158,7 @@ index 014295cd..b038aa18 100644 |
| 63 |
endif() |
| 64 |
|
| 65 |
if(STATIC_LIBC) |
| 66 |
-@@ -69,13 +70,13 @@ if (STATIC_LINKING) |
| 67 |
+@@ -69,13 +71,13 @@ if (STATIC_LINKING) |
| 68 |
else() |
| 69 |
find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS}) |
| 70 |
if(found_LLVM) |
Archives