Date: Saturday, December 11, 2021 @ 21:07:38 Author: heftig Revision: 431897
1.23-1 Modified: pahole/trunk/PKGBUILD pahole/trunk/python.diff -------------+ PKGBUILD | 8 ++++---- python.diff | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-11 19:16:09 UTC (rev 431896) +++ PKGBUILD 2021-12-11 21:07:38 UTC (rev 431897) @@ -1,8 +1,8 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> pkgname=pahole -pkgver=1.22 -pkgrel=4 +pkgver=1.23 +pkgrel=1 pkgdesc="Pahole and other DWARF utils" url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git" arch=(x86_64) @@ -10,13 +10,13 @@ depends=(libelf python) makedepends=(git cmake ninja) provides=(libdwarves{,_emit,_reorganize}.so) -_commit=f02af2553ea58ae1186226af0d0ec835a248358f # tags/v1.22^0 +_commit=c2b7b8c20877d267159ace36119f6340b9d12823 # tags/v1.23^0 source=("git+https://git.kernel.org/pub/scm/devel/pahole/pahole.git#commit=$_commit" "git+https://github.com/libbpf/libbpf" python.diff) sha256sums=('SKIP' 'SKIP' - '61f232298d59cbcd5e3c863e3f6866b45b7224d5c649dfb7737196233df034f1') + '8f73631f14ca665204bf5be36c5082eb4f89884dda5e5ae2dd66c990b9c11d51') pkgver() { cd pahole Modified: python.diff =================================================================== --- python.diff 2021-12-11 19:16:09 UTC (rev 431896) +++ python.diff 2021-12-11 21:07:38 UTC (rev 431897) @@ -1,13 +1,13 @@ diff --git i/CMakeLists.txt w/CMakeLists.txt -index 4140574..4bfe743 100644 +index c0363b8..58ff237 100644 --- i/CMakeLists.txt +++ w/CMakeLists.txt -@@ -187,6 +187,7 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h +@@ -188,7 +188,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) + if(Python3_FOUND) + install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +- install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) ++ install(FILES ostra/python/ostra.py DESTINATION ${Python3_SITELIB}) + endif() 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)
