Date: Monday, May 1, 2023 @ 17:35:15
Author: heftig
Revision: 476152
archrelease: copy trunk to testing-x86_64
Added:
pahole/repos/testing-x86_64/PKGBUILD
(from rev 476151, pahole/trunk/PKGBUILD)
pahole/repos/testing-x86_64/keys/
pahole/repos/testing-x86_64/python.diff
(from rev 476151, pahole/trunk/python.diff)
Deleted:
pahole/repos/testing-x86_64/PKGBUILD
pahole/repos/testing-x86_64/keys/
pahole/repos/testing-x86_64/python.diff
-------------+
PKGBUILD | 159 +++++++++++++++++++++++++++++++++++-----------------------
python.diff | 26 ++++-----
2 files changed, 110 insertions(+), 75 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-01 17:34:54 UTC (rev 476151)
+++ PKGBUILD 2023-05-01 17:35:15 UTC (rev 476152)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-
-pkgname=pahole
-pkgver=1.25
-pkgrel=3
-epoch=1
-pkgdesc="Pahole and other DWARF utils"
-url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
-arch=(x86_64)
-license=(GPL2)
-depends=(
- libelf
- python-matplotlib
-)
-makedepends=(
- cmake
- ninja
-)
-provides=(libdwarves{,_emit,_reorganize}.so)
-_commit=02d67c51765dfbd5893087da63744c864c7cc9e0 # master
-source=(
- https://fedorapeople.org/~acme/dwarves/dwarves-$pkgver.tar.{xz,sign}
- python.diff
-)
-b2sums=('1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e'
- 'SKIP'
-
'e88fcda77c0a6aaea0d83949cabbaaaf24f6a4b2324a14e459efc202b210c31b58f7a90c75c34ffd08911514b3b6db4be4423e3f8e0fb50b6d914da5be002319')
-validpgpkeys=(
- 2DBF5BAA46FB4DED338A335BD65016F35352AA40 # Arnaldo Carvalho de Melo
<[email protected]>
-)
-
-prepare() {
- cd dwarves-$pkgver
-
- # https://bugs.archlinux.org/task/70013
- patch -Np1 -i ../python.diff
-}
-
-build() {
- local cmake_options=(
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_BUILD_TYPE=None
- -D__LIB=lib
- )
-
- cmake -S dwarves-$pkgver -B build -G Ninja "${cmake_options[@]}"
- cmake --build build
-}
-
-check() {
- cd build
- ctest --output-on-failure --stop-on-failure -j$(nproc)
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- python -m compileall -d / "$pkgdir"
- python -O -m compileall -d / "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: pahole/repos/testing-x86_64/PKGBUILD (from rev 476151,
pahole/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-05-01 17:35:15 UTC (rev 476152)
@@ -0,0 +1,97 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+
+pkgbase=pahole
+pkgname=(
+ pahole
+ ostra-cg
+)
+pkgver=1.25
+pkgrel=4
+epoch=1
+pkgdesc="Pahole and other DWARF utils"
+url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
+arch=(x86_64)
+license=(GPL2)
+makedepends=(
+ bash
+ cmake
+ libelf
+ ninja
+ python
+ python-matplotlib
+ zlib
+)
+_commit=02d67c51765dfbd5893087da63744c864c7cc9e0 # master
+source=(
+ https://fedorapeople.org/~acme/dwarves/dwarves-$pkgver.tar.{xz,sign}
+ python.diff
+)
+b2sums=('1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e'
+ 'SKIP'
+
'e88fcda77c0a6aaea0d83949cabbaaaf24f6a4b2324a14e459efc202b210c31b58f7a90c75c34ffd08911514b3b6db4be4423e3f8e0fb50b6d914da5be002319')
+validpgpkeys=(
+ 2DBF5BAA46FB4DED338A335BD65016F35352AA40 # Arnaldo Carvalho de Melo
<[email protected]>
+)
+
+prepare() {
+ cd dwarves-$pkgver
+
+ # https://bugs.archlinux.org/task/70013
+ patch -Np1 -i ../python.diff
+}
+
+build() {
+ local cmake_options=(
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=None
+ -D__LIB=lib
+ )
+
+ cmake -S dwarves-$pkgver -B build -G Ninja "${cmake_options[@]}"
+ cmake --build build
+}
+
+check() {
+ cd build
+ ctest --output-on-failure --stop-on-failure -j$(nproc)
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_pahole() {
+ depends=(
+ bash
+ libelf
+ zlib
+ )
+ optdepends=('ostra-cg: Generate call graphs from encoded traces')
+ provides=(libdwarves{,_emit,_reorganize}.so)
+
+ DESTDIR="$pkgdir" cmake --install build
+
+ _pick ostra "$pkgdir"/usr/{bin/ostra-cg,lib/python*}
+}
+
+package_ostra-cg() {
+ pkgdesc="Generate call graphs from encoded traces"
+ depends=(
+ pahole
+ python
+ python-matplotlib
+ )
+
+ mv ostra/* "$pkgdir"
+
+ python -m compileall -d /usr/lib "$pkgdir/usr/lib"
+ python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: python.diff
===================================================================
--- python.diff 2023-05-01 17:34:54 UTC (rev 476151)
+++ python.diff 2023-05-01 17:35:15 UTC (rev 476152)
@@ -1,13 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 98642e1..b4295fd 100644
---- i/CMakeLists.txt
-+++ w/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
Copied: pahole/repos/testing-x86_64/python.diff (from rev 476151,
pahole/trunk/python.diff)
===================================================================
--- python.diff (rev 0)
+++ python.diff 2023-05-01 17:35:15 UTC (rev 476152)
@@ -0,0 +1,13 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index 98642e1..b4295fd 100644
+--- i/CMakeLists.txt
++++ w/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
