pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/collectd py-collectd: fix build with python 3.11



details:   https://anonhg.NetBSD.org/pkgsrc/rev/58105ca8bc09
branches:  trunk
changeset: 388258:58105ca8bc09
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 15 12:37:41 2022 +0000

description:
py-collectd: fix build with python 3.11

diffstat:

 sysutils/collectd/distinfo                    |   3 ++-
 sysutils/collectd/patches/patch-src_cpython.h |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (45 lines):

diff -r 12d2a975b46a -r 58105ca8bc09 sysutils/collectd/distinfo
--- a/sysutils/collectd/distinfo        Tue Nov 15 12:23:45 2022 +0000
+++ b/sysutils/collectd/distinfo        Tue Nov 15 12:37:41 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2021/10/26 11:19:26 nia Exp $
+$NetBSD: distinfo,v 1.50 2022/11/15 12:37:41 wiz Exp $
 
 BLAKE2s (collectd-5.12.0.tar.bz2) = bf8597bde2bb46fe5f3546d18944dbc40df9b64b3fd1ee43a5882203d4803e0a
 SHA512 (collectd-5.12.0.tar.bz2) = 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
@@ -6,6 +6,7 @@
 SHA1 (patch-Makefile.am) = 03739025e31bfa862a7194ba0e6c86a5031dbe16
 SHA1 (patch-src_bind.c) = ee9f6c5e7828010b4beecff4b2d3d8ff2aebc7ac
 SHA1 (patch-src_collectd.conf.in) = ee885263d5dca87857c8d56069952db0d4ffef37
+SHA1 (patch-src_cpython.h) = 61bfdbf1c71c45a1132da92f55edb649774216a8
 SHA1 (patch-src_df.c) = de699d221b003b70c22308cf43f4d61daa4071f7
 SHA1 (patch-src_libcollectdclient_network__buffer.c) = 541332bcffcbcbb2e398275f93e2aa1ae8861598
 SHA1 (patch-src_netstat__udp.c) = 4763c9c26a5639a84d1ed306b40c5b761110f632
diff -r 12d2a975b46a -r 58105ca8bc09 sysutils/collectd/patches/patch-src_cpython.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/collectd/patches/patch-src_cpython.h     Tue Nov 15 12:37:41 2022 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_cpython.h,v 1.1 2022/11/15 12:37:41 wiz Exp $
+
+Fix build with python 3.11.
+https://github.com/collectd/collectd/commit/623e95394e0e62e7f9ced2104b786d21e9c0bf53
+
+--- src/cpython.h.orig 2020-07-20 09:50:14.293155228 +0000
++++ src/cpython.h
+@@ -24,9 +24,16 @@
+  *   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



Home | Main Index | Thread Index | Old Index