summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Licht <jonas.licht@fem.tu-ilmenau.de>2021-07-04 12:37:18 +0200
committerJoonas Niilola <juippis@gentoo.org>2021-07-14 18:00:58 +0300
commitfd00b25bba34b49090a9af7c77fb582144527ead (patch)
treeb0806d88a404a4ee6436305b0d9d6a292d91d579 /app-emulation/xen-tools
parentapp-editors/vscodium: cleanup old versions (diff)
downloadgentoo-fd00b25bba34b49090a9af7c77fb582144527ead.tar.gz
gentoo-fd00b25bba34b49090a9af7c77fb582144527ead.tar.bz2
gentoo-fd00b25bba34b49090a9af7c77fb582144527ead.zip
app-emulation/xen-tools: fix xenstat python bindings in 4.15
Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de> Closes: https://github.com/gentoo/gentoo/pull/21527 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-emulation/xen-tools')
-rw-r--r--app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch18
-rw-r--r--app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.15.0-r1.ebuild)14
2 files changed, 25 insertions, 7 deletions
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
new file mode 100644
index 00000000000..3547b7346ee
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
@@ -0,0 +1,18 @@
+--- a/tools/libs/stat/Makefile 2021-07-01 19:32:50.696318503 +0200
++++ b/tools/libs/stat/Makefile 2021-07-01 00:16:15.102473301 +0200
+@@ -51,12 +51,13 @@
+ .PHONY: uninstall-bindings
+ uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings
+
+-$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h
++$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h
+
+-SWIG_FLAGS=-module xenstat -Iinclude -I.
++SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/
+
+ # Python bindings
+ PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'`
++PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat
+ $(PYMOD): $(PYSRC)
+ $(PYSRC): bindings/swig/xenstat.i
+ swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $<
diff --git a/app-emulation/xen-tools/xen-tools-4.15.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
index c062f81eb41..af982d2bd20 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
@@ -181,6 +181,8 @@ QA_PREBUILT="
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-fix-xenstat-python-bindings.patch" )
+
pkg_setup() {
python_setup
export "CONFIG_LOMOUNT=y"
@@ -419,8 +421,7 @@ src_configure() {
src_compile() {
local myopt
use debug && myopt="${myopt} debug=y"
- # Currently broken
- #use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+ use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
@@ -499,11 +500,10 @@ src_install() {
keepdir /var/lib/xenstored
keepdir /var/log/xen
- # Currently broken
- #if use python; then
- #python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
- #python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
- #fi
+ if use python; then
+ python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+ python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+ fi
python_optimize
}