Attachment 18702 Details for Bug 15904 – current patch

[patch] current patch

samba-pcp-7.0.0.patch (text/plain), 2.08 KB, created by Alexander Bokovoy on 2025-09-03 13:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Bokovoy

Created: 2025-09-03 13:10:46 UTC

Size: 2.08 KB

patch

obsolete

>From edede7256f7bfa25186e22b3c5f1aab9a56ac141 Mon Sep 17 00:00:00 2001
>From: Alexander Bokovoy <ab@samba.org>
>Date: Wed, 3 Sep 2025 15:42:46 +0300
>Subject: [PATCH] ctdb/wscript: fix build against PCP 7.0.0
>
>Signed-off-by: Alexander Bokovoy <ab@samba.org>
>---
> ctdb/utils/pmda/pmda_ctdb.c |  4 ++++
> ctdb/wscript                | 20 +++++++++-----------
> 2 files changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
>index 7ac8a3b38d1..a8d6704c8a9 100644
>--- a/ctdb/utils/pmda/pmda_ctdb.c
>+++ b/ctdb/utils/pmda/pmda_ctdb.c
>@@ -39,9 +39,13 @@
> 
> #define pmID_cluster(id)	id->cluster
> #define pmID_item(id)		id->item
>+#ifndef pmGetProgname
> #define pmGetProgname()		pmProgname
>+#endif
>+#ifndef pmSetProgname
> #define pmSetProgname(a)	__pmSetProgname(a)
> #endif
>+#endif
> 
> #include "domain.h"
> 
>diff --git a/ctdb/wscript b/ctdb/wscript
>index e9cd89436a3..15dedb1c432 100644
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -226,17 +226,15 @@ def configure(conf):
> 
>     have_pmda = False
>     if Options.options.ctdb_pmda:
>-        pmda_support = True
>-
>-        if not conf.CHECK_HEADERS('pcp/pmapi.h pcp/impl.h pcp/pmda.h',
>-                                  together=True):
>-            pmda_support = False
>-        if not conf.CHECK_FUNCS_IN('pmProgname', 'pcp'):
>-            pmda_support = False
>-        if not conf.CHECK_FUNCS_IN('pmdaDaemon', 'pcp_pmda'):
>-            pmda_support = False
>-        if pmda_support:
>-            conf.CHECK_TYPE_IN('__pmID_int', 'pcp/pmapi.h pcp/impl.h')
>+        checks = [conf.CHECK_HEADERS('pcp/pmapi.h pcp/impl.h pcp/pmda.h',
>+                                     together=True),
>+                  conf.CHECK_FUNCS_IN('pmdaDaemon', 'pcp_pmda')]
>+
>+        have_progname = [conf.CHECK_FUNCS_IN('pmProgname', 'pcp'),
>+                         conf.CHECK_FUNCS_IN('pmGetProgname', 'pcp')]
>+
>+        if all(checks) and any(have_progname):
>+            conf.CHECK_TYPE_IN('__pmID_int', 'libpcp.h pcp/pmapi.h pcp/impl.h')
>             have_pmda = True
>         else:
>             Logs.error("PMDA support not available")
>-- 
>2.51.0
>

Actions: View

Attachments on bug 15904: 18702 | 18709 | 18726