From c511ff0fceaf8befd53d41ed6ce08172710a1656 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 24 Sep 2026 16:32:23 +0200 Subject: [PATCH 1/3] Add missing dependencies to meson headerscheck target These checks compile headers, so all the headers they might include need to have been generated. The makefile target does that, but the meson implementation didn't do that. (Arguably a bit of a bug in commit e82fc27e095.) Add the required dependencies so that meson compile headerscheck works in an unbuilt tree as well (as is documented). --- meson.build | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index f4cde249242..2993c568680 100644 --- a/meson.build +++ b/meson.build @@ -4131,12 +4131,24 @@ add_test_setup('running', ############################################################### headerscheck = files('src/tools/pginclude/headerscheck') + +# These checks compile headers, so all the headers they might include +# need to have been generated. +headerscheck_depends = [ + generated_headers_stamp, + generated_backend_headers_stamp, + backend_parser, + jsonpath_gram, +] + run_target('headerscheck', - command: [headerscheck, meson.project_source_root(), meson.project_build_root()] + command: [headerscheck, meson.project_source_root(), meson.project_build_root()], + depends: headerscheck_depends, ) run_target('cpluspluscheck', - command: [headerscheck, '--cplusplus', meson.project_source_root(), meson.project_build_root()] + command: [headerscheck, '--cplusplus', meson.project_source_root(), meson.project_build_root()], + depends: headerscheck_depends, ) base-commit: 4545cee303c257e58195e3d033c05bf38e2cd4d6 -- 2.55.0