[arch-commits] Commit in pahole/repos/extra-x86_64 (PKGBUILD PKGBUILD python.diff)

[Jan Steffens]

    Date: Tuesday, March 16, 2021 @ 14:02:44
  Author: heftig
Revision: 410050

archrelease: copy trunk to extra-x86_64

Added:
  pahole/repos/extra-x86_64/PKGBUILD
    (from rev 410049, pahole/trunk/PKGBUILD)
  pahole/repos/extra-x86_64/python.diff
    (from rev 410049, pahole/trunk/python.diff)
Deleted:
  pahole/repos/extra-x86_64/PKGBUILD

-------------+
 PKGBUILD    |  103 ++++++++++++++++++++++++++++++----------------------------
 python.diff |   13 +++++++
 2 files changed, 67 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-16 14:02:31 UTC (rev 410049)
+++ PKGBUILD	2021-03-16 14:02:44 UTC (rev 410050)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=pahole
-pkgver=1.20
-pkgrel=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)
-makedepends=(git cmake ninja)
-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")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd pahole
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
-  cd pahole
-
-  git submodule init
-  git submodule set-url lib/bpf "$srcdir/libbpf"
-  git submodule update
-}
-
-build() {
-  CFLAGS+=" $CPPFLAGS"
-  cmake -S pahole -B build -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=None \
-    -D__LIB=lib
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  export PYTHONHASHSEED=0
-  python -m compileall -d / "$pkgdir"
-  python -O -m compileall -d / "$pkgdir"
-}
-
-# vim:set sw=2 et:

Copied: pahole/repos/extra-x86_64/PKGBUILD (from rev 410049, pahole/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-16 14:02:44 UTC (rev 410050)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=pahole
+pkgver=1.20
+pkgrel=2
+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)
+makedepends=(git cmake ninja)
+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"
+        python.diff)
+sha256sums=('SKIP'
+            'SKIP'
+            'defaea9ad325a73bb27bd029065604c084dd32f132b5eaa431718533e94dc073')
+
+pkgver() {
+  cd pahole
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+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
+}
+
+build() {
+  CFLAGS+=" $CPPFLAGS"
+  cmake -S pahole -B build -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -D__LIB=lib
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+
+  export PYTHONHASHSEED=0
+  python -m compileall -d / "$pkgdir"
+  python -O -m compileall -d / "$pkgdir"
+}
+
+# vim:set sw=2 et:

Copied: pahole/repos/extra-x86_64/python.diff (from rev 410049, pahole/trunk/python.diff)
===================================================================
--- python.diff	                        (rev 0)
+++ python.diff	2021-03-16 14:02:44 UTC (rev 410050)
@@ -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)