[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/

[Patrick McLean]

commit:     c1d1ece10f2f6dd3f34d59b0b4066f8f0d73eaa0
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 18:04:10 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 18:04:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d1ece1

dev-util/bpftrace-0.12.1-r1: revbump, fix up library installation

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../bpftrace/{bpftrace-0.12.1.ebuild => bpftrace-0.12.1-r1.ebuild} | 0
 dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch         | 7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild 
b/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.12.1.ebuild
rename to dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild

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
index ef715ea5da8..04c08b3efa8 100644
--- a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
@@ -31,19 +31,20 @@ index a95c60a1..f5c4d676 100644
  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 37ee2204..d35574f5 100644
+index 37ee2204..8b2e1909 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -145,7 +145,7 @@ if (ALLOW_UNSAFE_PROBE)
+@@ -145,7 +145,8 @@ if (ALLOW_UNSAFE_PROBE)
    target_compile_definitions(libbpftrace PRIVATE HAVE_UNSAFE_PROBE)
  endif(ALLOW_UNSAFE_PROBE)
  
 -target_link_libraries(libbpftrace arch ast parser resources)
 +target_link_libraries(libbpftrace bpftracearch bpftraceast bpftraceparser 
bpftraceresources)
++install(TARGETS bpftracearch bpftraceast bpftraceparser LIBRARY DESTINATION 
${CMAKE_INSTALL_LIBDIR})
  
  target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES})
  if(STATIC_LINKING)
-@@ -194,6 +194,7 @@ if (USE_LIBFUZZER)
+@@ -194,6 +195,7 @@ if (USE_LIBFUZZER)
  endif()
  
  install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})