From 287386efc9ad1f5d3d2f3ffbcae20c5e0ae0f532 Mon Sep 17 00:00:00 2001 From: kth5 Date: Sat, 17 Aug 2024 04:31:21 +0200 Subject: [PATCH] * update pahole to 1:1.27-2 --- pahole/.SRCINFO | 38 +++++++++++++++++++ pahole/.nvchecker.toml | 5 +++ ...nstall-ostra.py-into-Python3_SITELIB.patch | 26 +++++++++++++ pahole/PKGBUILD | 23 ++++++----- 4 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 pahole/.SRCINFO create mode 100644 pahole/.nvchecker.toml create mode 100644 pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch diff --git a/pahole/.SRCINFO b/pahole/.SRCINFO new file mode 100644 index 0000000000..81c6fe5fdd --- /dev/null +++ b/pahole/.SRCINFO @@ -0,0 +1,38 @@ +pkgbase = pahole + pkgdesc = Pahole and other DWARF utils + pkgver = 1.27 + pkgrel = 2 + epoch = 1 + url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git + arch = x86_64 + license = GPL-2.0-only + makedepends = bash + makedepends = cmake + makedepends = git + makedepends = glibc + makedepends = libelf + makedepends = ninja + makedepends = python + makedepends = python-matplotlib + makedepends = zlib + source = git+https://github.com/acmel/dwarves?signed#tag=v1.27 + source = 0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch + validpgpkeys = 2DBF5BAA46FB4DED338A335BD65016F35352AA40 + b2sums = a2c7641d85ccc4489e4d55f6f59cb0338674a877a7265eacf9ffcb0f05e33b2cd322aaa3af32b75583d0f7847a98b0d6c16e4a001c2a566b2845a52e01247259 + b2sums = 02962095407cdbf191428884b83c3392e39d4acdad0c6a952655daec8b871bab8962c3716c9479192118eef81afe412203ac46600a2d702733254c6d7219f7d2 + +pkgname = pahole + depends = bash + depends = glibc + depends = libelf + depends = zlib + optdepends = ostra-cg: Generate call graphs from encoded traces + provides = libdwarves.so + provides = libdwarves_emit.so + provides = libdwarves_reorganize.so + +pkgname = ostra-cg + pkgdesc = Generate call graphs from encoded traces + depends = pahole + depends = python + depends = python-matplotlib diff --git a/pahole/.nvchecker.toml b/pahole/.nvchecker.toml new file mode 100644 index 0000000000..5dabef8b0b --- /dev/null +++ b/pahole/.nvchecker.toml @@ -0,0 +1,5 @@ +[pahole] +source = "github" +github = "acmel/dwarves" +use_max_tag = true +prefix = "v" diff --git a/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch b/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch new file mode 100644 index 0000000000..f1d288cca1 --- /dev/null +++ b/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 11 Jun 2024 23:57:52 +0200 +Subject: [PATCH] CMakeLists.txt: Install ostra.py into Python3_SITELIB dir + +Otherwise ostra-cg won't be able to find it. I'm not sure what +the "/usr/share/dwarves/runtime/python/" directory is supposed to be. + +Signed-off-by: Jan Alexander Steffens (heftig) +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ca1bf2173a7..ca997bc040c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -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/) + 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 lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu diff --git a/pahole/PKGBUILD b/pahole/PKGBUILD index c61ca93bf9..8551327f29 100644 --- a/pahole/PKGBUILD +++ b/pahole/PKGBUILD @@ -6,7 +6,7 @@ pkgname=( pahole ostra-cg ) -pkgver=1.26 +pkgver=1.27 pkgrel=2 epoch=1 pkgdesc="Pahole and other DWARF utils" @@ -16,6 +16,7 @@ license=(GPL-2.0-only) makedepends=( bash cmake + git glibc libelf ninja @@ -24,21 +25,25 @@ makedepends=( zlib ) source=( - https://fedorapeople.org/~acme/dwarves/dwarves-$pkgver.tar.{xz,sign} - python.diff + "git+https://github.com/acmel/dwarves?signed#tag=v$pkgver" + 0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch ) -b2sums=('cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666' - 'SKIP' - 'd423eb1e05b634516ae1cf652e291fd559650b00b016ed35d0f2bd8ccb04ffd9e1ed1c53e95d86039d656651633792932544de1871a09cb8b4953fa8026492e9') +b2sums=('a2c7641d85ccc4489e4d55f6f59cb0338674a877a7265eacf9ffcb0f05e33b2cd322aaa3af32b75583d0f7847a98b0d6c16e4a001c2a566b2845a52e01247259' + '02962095407cdbf191428884b83c3392e39d4acdad0c6a952655daec8b871bab8962c3716c9479192118eef81afe412203ac46600a2d702733254c6d7219f7d2') validpgpkeys=( 2DBF5BAA46FB4DED338A335BD65016F35352AA40 # Arnaldo Carvalho de Melo ) prepare() { - cd dwarves-$pkgver + cd dwarves + + # Fix kernel build with Clang + # https://gitlab.archlinux.org/archlinux/packaging/packages/pahole/-/issues/1 + git cherry-pick -n 6a2b27c0f512619b0e7a769a18a0fb05bb3789a5 \ + 94a01bde592c555b3eb526aeb4c2ad695c5660d8 # https://bugs.archlinux.org/task/70013 - patch -Np1 -i ../python.diff + git apply -3 ../0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch } build() { @@ -48,7 +53,7 @@ build() { -D __LIB=lib ) - cmake -S dwarves-$pkgver -B build -G Ninja "${cmake_options[@]}" + cmake -S dwarves -B build -G Ninja "${cmake_options[@]}" cmake --build build }