[arch-commits] Commit in pahole/trunk (PKGBUILD python.diff)

[Jan Steffens]

    Date: Tuesday, March 16, 2021 @ 14:02:31
  Author: heftig
Revision: 410049

1.20-2: FS#70013

Added:
  pahole/trunk/python.diff
Modified:
  pahole/trunk/PKGBUILD

-------------+
 PKGBUILD    |   11 ++++++++---
 python.diff |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-16 14:01:01 UTC (rev 410048)
+++ PKGBUILD	2021-03-16 14:02:31 UTC (rev 410049)
@@ -2,7 +2,7 @@
 
 pkgname=pahole
 pkgver=1.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Pahole and other DWARF utils"
 url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 arch=(x86_64)
@@ -12,9 +12,11 @@
 provides=(libdwarves{,_emit,_reorganize}.so)
 _commit=0d415f68c468b77c5bf8e71965cd08c6efd25fc4  # tags/v1.20^0
 source=("git+https://git.kernel.org/pub/scm/devel/pahole/pahole.git#commit=$_commit"
-        "git+https://github.com/libbpf/libbpf")
+        "git+https://github.com/libbpf/libbpf"
+        python.diff)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            'defaea9ad325a73bb27bd029065604c084dd32f132b5eaa431718533e94dc073')
 
 pkgver() {
   cd pahole
@@ -24,6 +26,9 @@
 prepare() {
   cd pahole
 
+  # https://bugs.archlinux.org/task/70013
+  git apply -3 ../python.diff
+
   git submodule init
   git submodule set-url lib/bpf "$srcdir/libbpf"
   git submodule update

Added: python.diff
===================================================================
--- python.diff	                        (rev 0)
+++ python.diff	2021-03-16 14:02:31 UTC (rev 410049)
@@ -0,0 +1,13 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index 7f72c7a..f8c42b1 100644
+--- i/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -161,6 +161,7 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h
+ install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/)
+ install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+-install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python)
++find_package(Python3)
++install(FILES ostra/python/ostra.py DESTINATION ${Python3_SITELIB})
+ install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu
+ 	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime)