The third patch adds support to Meson by adding a coccicheck target. Since
ninja (which is used in the chapter "Building and Installation with
Meson"[1]) does not support variables in the same way as make does, it is
currently necessary to use:
MODE=patch ninja coccicheck
An alternative is to have three explicit targets "coccicheck-report",
"coccicheck-context", and "coccicheck-patch", which might be easier to use.
It does not work if you want to pass other flags, however, so you would
still have to use something like this if you want to pass in extra flags:
SPFLAGS=--debug ninja coccicheck-context
[1]: https://www.postgresql.org/docs/current/install-meson.html
--
Best wishes,
Mats Kindahl, Timescale
From bb908e22e7a255a66b738f9180f4c6aa97e85624 Mon Sep 17 00:00:00 2001
From: Mats Kindahl <m...@kindahl.net>
Date: Wed, 1 Jan 2025 14:15:51 +0100
Subject: Add meson build for coccicheck
This commit adds a run target `coccicheck` to meson build files.
Since ninja does not accept parameters the same way make does, you have to set
the MODE parameter to generate a patch (from the "build" subdirectory created
by the meson run):
MODE=patch ninja coccicheck | patch -d .. -p1
---
meson.build | 21 +++++++++++++++++++++
meson_options.txt | 7 ++++++-
src/makefiles/meson.build | 6 ++++++
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index e5ce437a5c7..528184208e9 100644
--- a/meson.build
+++ b/meson.build
@@ -348,6 +348,7 @@ missing = find_program('config/missing', native: true)
cp = find_program('cp', required: false, native: true)
xmllint_bin = find_program(get_option('XMLLINT'), native: true, required: false)
xsltproc_bin = find_program(get_option('XSLTPROC'), native: true, required: false)
+spatch = find_program(get_option('SPATCH'), native: true, required: false)
bison_flags = []
if bison.found()
@@ -1546,6 +1547,25 @@ else
endif
+###############################################################
+# Option: Coccinelle checks
+###############################################################
+
+coccicheck_opt = get_option('coccicheck')
+coccicheck_dep = not_found_dep
+if not coccicheck_opt.disabled()
+ if spatch.found()
+ coccicheck_dep = declare_dependency()
+ elif coccicheck_opt.enabled()
+ error('missing required tools (spatch needed) for Coccinelle checks')
+ endif
+endif
+
+run_target('coccicheck',
+ command: [python, files('src/tools/coccicheck.py'),
+ '--spatch', spatch,
+ '@SOURCE_ROOT@/cocci/**/*.cocci',
+ '@SOURCE_ROOT@'])
###############################################################
# Compiler tests
@@ -3684,6 +3704,7 @@ if meson.version().version_compare('>=0.57')
{
'bison': '@0@ @1@'.format(bison.full_path(), bison_version),
'dtrace': dtrace,
+ 'spatch': spatch,
'flex': '@0@ @1@'.format(flex.full_path(), flex_version),
},
section: 'Programs',
diff --git a/meson_options.txt b/meson_options.txt
index 38935196394..ef8e9923cfa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -43,6 +43,9 @@ option('cassert', type: 'boolean', value: false,
option('tap_tests', type: 'feature', value: 'auto',
description: 'Enable TAP tests')
+option('coccicheck', type: 'feature', value: 'auto',
+ description: 'Enable Coccinelle checks')
+
option('injection_points', type: 'boolean', value: false,
description: 'Enable injection points')
@@ -52,7 +55,6 @@ option('PG_TEST_EXTRA', type: 'string', value: '',
option('PG_GIT_REVISION', type: 'string', value: 'HEAD',
description: 'git revision to be packaged by pgdist target')
-
# Compilation options
option('extra_include_dirs', type: 'array', value: [],
@@ -192,6 +194,9 @@ option('PYTHON', type: 'array', value: ['python3', 'python'],
option('SED', type: 'string', value: 'gsed',
description: 'Path to sed binary')
+option('SPATCH', type: 'string', value: 'spatch',
+ description: 'Path to spatch binary, used for SmPL patches')
+
option('STRIP', type: 'string', value: 'strip',
description: 'Path to strip binary, used for PGXS emulation')
diff --git a/src/makefiles/meson.build b/src/makefiles/meson.build
index aba7411a1be..bf4c4c3c093 100644
--- a/src/makefiles/meson.build
+++ b/src/makefiles/meson.build
@@ -57,6 +57,7 @@ pgxs_kv = {
'enable_injection_points': get_option('injection_points') ? 'yes' : 'no',
'enable_tap_tests': tap_tests_enabled ? 'yes' : 'no',
'enable_debug': get_option('debug') ? 'yes' : 'no',
+ 'enable_coccicheck': spatch.found() ? 'yes' : 'no',
'enable_coverage': 'no',
'enable_dtrace': dtrace.found() ? 'yes' : 'no',
@@ -151,6 +152,7 @@ pgxs_bins = {
'TAR': tar,
'ZSTD': program_zstd,
'DTRACE': dtrace,
+ 'SPATCH': spatch,
}
pgxs_empty = [
@@ -166,6 +168,10 @@ pgxs_empty = [
'DBTOEPUB',
'FOP',
+ # Coccinelle is not supported by pgxs
+ 'SPATCH',
+ 'SPFLAGS',
+
# supporting coverage for pgxs-in-meson build doesn't seem worth it
'GENHTML',
'LCOV',
--
2.43.0
