Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
Date: Tue, 20 Apr 2021 18:04:37
Message-Id: 1618941866.c1d1ece10f2f6dd3f34d59b0b4066f8f0d73eaa0.chutzpah@gentoo
1 commit: c1d1ece10f2f6dd3f34d59b0b4066f8f0d73eaa0
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 20 18:04:10 2021 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 20 18:04:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d1ece1
7
8 dev-util/bpftrace-0.12.1-r1: revbump, fix up library installation
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
12
13 .../bpftrace/{bpftrace-0.12.1.ebuild => bpftrace-0.12.1-r1.ebuild} | 0
14 dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch | 7 ++++---
15 2 files changed, 4 insertions(+), 3 deletions(-)
16
17 diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild b/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
18 similarity index 100%
19 rename from dev-util/bpftrace/bpftrace-0.12.1.ebuild
20 rename to dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
21
22 diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
23 index ef715ea5da8..04c08b3efa8 100644
24 --- a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
25 +++ b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
26 @@ -31,19 +31,20 @@ index a95c60a1..f5c4d676 100644
27 function(embed_headers output)
28 file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
29 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
30 -index 37ee2204..d35574f5 100644
31 +index 37ee2204..8b2e1909 100644
32 --- a/src/CMakeLists.txt
33 +++ b/src/CMakeLists.txt
34 -@@ -145,7 +145,7 @@ if (ALLOW_UNSAFE_PROBE)
35 +@@ -145,7 +145,8 @@ if (ALLOW_UNSAFE_PROBE)
36 target_compile_definitions(libbpftrace PRIVATE HAVE_UNSAFE_PROBE)
37 endif(ALLOW_UNSAFE_PROBE)
38
39 -target_link_libraries(libbpftrace arch ast parser resources)
40 +target_link_libraries(libbpftrace bpftracearch bpftraceast bpftraceparser bpftraceresources)
41 ++install(TARGETS bpftracearch bpftraceast bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
42
43 target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES})
44 if(STATIC_LINKING)
45 -@@ -194,6 +194,7 @@ if (USE_LIBFUZZER)
46 +@@ -194,6 +195,7 @@ if (USE_LIBFUZZER)
47 endif()
48
49 install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})