snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Activity

perf: use Python 3.

This commit is contained in:
Leah Neukirchen 2019-12-30 16:43:37 +01:00
parent 4ecd410654
commit f09ef7a56b
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcpkgs/linux-tools/patches/python3.8.patch Normal file
View File

@ -0,0 +1,15 @@
--- tools/perf/Makefile.config.orig
+++ tools/perf/Makefile.config
@@ -225,10 +225,10 @@
PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG))
ifdef PYTHON_CONFIG
- PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)
+ PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --embed --ldflags 2>/dev/null)
PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil
- PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --includes 2>/dev/null)
+ PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --embed --includes 2>/dev/null)
FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
endif

8
srcpkgs/linux-tools/template
View File

@ -4,10 +4,10 @@ version=5.3.1
revision=1 revision=1
wrksrc="linux-${version}" wrksrc="linux-${version}"
build_style=meta build_style=meta
hostmakedepends="asciidoc automake flex libtool perl python xmlto" hostmakedepends="asciidoc automake flex libtool perl python3 xmlto"
makedepends="babeltrace-devel binutils-devel eudev-libudev-devel makedepends="babeltrace-devel binutils-devel eudev-libudev-devel
liblzma-devel libressl-devel libsysfs-devel libunwind-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
ncurses-devel pciutils-devel python-devel slang-devel" ncurses-devel pciutils-devel python3-devel slang-devel"
depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}" depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
short_desc="Linux kernel tools meta-pkg" short_desc="Linux kernel tools meta-pkg"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
@ -43,7 +43,7 @@ do_build() {
cd ${wrksrc}/tools/perf cd ${wrksrc}/tools/perf
make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \
NO_GTK2=1 NO_SDT=1 \ NO_GTK2=1 NO_SDT=1 PYTHON=python3 \
PERF_VERSION=${version}_${revision} \ PERF_VERSION=${version}_${revision} \
all man all man
@ -89,7 +89,7 @@ do_install() {
cd ${wrksrc}/tools/perf cd ${wrksrc}/tools/perf
make CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ make CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \
NO_GTK2=1 NO_SDT=1 \ NO_GTK2=1 NO_SDT=1 PYTHON=python3 \
PERF_VERSION=${version}_${revision} \ PERF_VERSION=${version}_${revision} \
install install-man install install-man
# move completion in new directory # move completion in new directory