From 66c4fab53cbb2aae1f2b6c545a06ff7ccf43b0cc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 30 Sep 2023 12:02:22 -0400 Subject: [PATCH] linux-tools: rebuild for Python 3.12 --- srcpkgs/linux-tools/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index d938d96b53a..66b9c25de69 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,10 +1,10 @@ # Template file for 'linux-tools' pkgname=linux-tools version=6.5 -revision=1 +revision=2 build_style=meta -hostmakedepends="asciidoc automake flex gettext libtool perl python3 - python3-docutils xmlto pkg-config" +hostmakedepends="asciidoc automake flex gettext libtool perl + python3-setuptools python3-docutils xmlto pkg-config" makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel @@ -18,9 +18,11 @@ distfiles="${KERNEL_SITE}/kernel/v${version%%.*}.x/linux-${version}.tar.xz" checksum=7a574bbc20802ea76b52ca7faf07267f72045e861b18915c5272a98c27abf884 python_version=3 -subpackages="cpupower freefall libcpupower libcpupower-devel libusbip libusbip-devel perf tmon usbip bpftool" +subpackages="cpupower freefall libcpupower libcpupower-devel libusbip + libusbip-devel perf tmon usbip bpftool" CFLAGS="-Wno-error" + case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" libnuma-devel" @@ -31,12 +33,14 @@ ppc64*) makedepends+=" libnuma-devel" ;; esac + if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" argp-standalone" fi -case "$XBPS_TARGET_MACHINE" in -i686-musl) makedepends+=" libunwind-devel" ;; -esac + +if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then + makedepends+=" libunwind-devel" +fi post_extract() { vsed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile