mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-metrics/collectd: fix compilation with python3_11
Closes: https://bugs.gentoo.org/880445 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
@@ -170,7 +170,10 @@ REQUIRED_USE="
|
||||
collectd_plugins_smart? ( udev )
|
||||
contrib? ( perl )"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch
|
||||
"${FILESDIR}"/${PN}-5.12.0-python3_11.patch
|
||||
)
|
||||
|
||||
# @FUNCTION: collectd_plugin_kernel_linux
|
||||
# @DESCRIPTION:
|
||||
|
||||
33
app-metrics/collectd/files/collectd-5.12.0-python3_11.patch
Normal file
33
app-metrics/collectd/files/collectd-5.12.0-python3_11.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
From 623e95394e0e62e7f9ced2104b786d21e9c0bf53 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
||||
<congdanhqx@gmail.com>
|
||||
Date: Wed, 21 Sep 2022 22:21:58 +0700
|
||||
Subject: [PATCH] cpython: fix build with Python 3.11
|
||||
|
||||
Python 3.11 moves longintrepr.h into cpython sub-directory.
|
||||
However, in this version, longintrepr.h is always included.
|
||||
---
|
||||
src/cpython.h | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cpython.h b/src/cpython.h
|
||||
index 11e64fa62f..bcfa406feb 100644
|
||||
--- a/src/cpython.h
|
||||
+++ b/src/cpython.h
|
||||
@@ -24,9 +24,15 @@
|
||||
* Sven Trenkel <collectd at semidefinite.de>
|
||||
**/
|
||||
|
||||
+#include <Python.h>
|
||||
/* Some python versions don't include this by default. */
|
||||
-
|
||||
+#if PY_VERSION_HEX < 0x030B0000
|
||||
+/*
|
||||
+ * Python 3.11 move longintrepr.h to cpython/longintrepr.h
|
||||
+ * And it's always included
|
||||
+ */
|
||||
#include <longintrepr.h>
|
||||
+#endif /* PY_VERSION_HEX < 0x030B0000 */
|
||||
|
||||
/* These two macros are basically Py_BEGIN_ALLOW_THREADS and
|
||||
* Py_BEGIN_ALLOW_THREADS
|
||||
Reference in New Issue
Block a user