From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: Karthik Nayak <karthik.188@gmail.com>,
toon@iotcl.com, gitster@pobox.com, phillip.wood123@gmail.com,
ps@pks.im
Subject: [PATCH v4 4/5] meson: add support for 'hdr-check'
Date: Sun, 20 Apr 2025 14:21:36 +0200 [thread overview]
Message-ID: <20250420-505-wire-up-sparse-via-meson-v4-4-66e14134e822@gmail.com> (raw)
In-Reply-To: <20250420-505-wire-up-sparse-via-meson-v4-0-66e14134e822@gmail.com>
The Makefile supports a target called 'hdr-check', which checks if
individual header files can be independently compiled. Let's port this
functionality to Meson, our new build system too. The implementation
resembles that of the Makefile and provides the same check.
Since meson builds are out-of-tree, header dependencies are not
automatically met. So unlike the Makefile version, we also need to add
the required dependencies.
Also add the 'xdiff/' dir to the list of 'third_party_sources' as those
headers must be skipped from the checks too. This also skips the folder
from the 'coccinelle' checks, this is okay, since this code is an
external dependency.
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
meson.build | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/meson.build b/meson.build
index c4dcf756b3..afbdc97fb6 100644
--- a/meson.build
+++ b/meson.build
@@ -645,6 +645,7 @@ third_party_excludes = [
':!sha1dc',
':!t/unit-tests/clar',
':!t/t[0-9][0-9][0-9][0-9]*',
+ ':!xdiff',
]
if git.found()
@@ -1994,6 +1995,68 @@ endif
subdir('contrib')
+exclude_from_check_headers = [
+ 'compat/',
+ 'unicode-width.h',
+]
+
+if sha1_backend != 'openssl'
+ exclude_from_check_headers += 'sha1/openssl.h'
+endif
+if sha256_backend != 'openssl'
+ exclude_from_check_headers += 'sha256/openssl.h'
+endif
+if sha256_backend != 'nettle'
+ exclude_from_check_headers += 'sha256/nettle.h'
+endif
+if sha256_backend != 'gcrypt'
+ exclude_from_check_headers += 'sha256/gcrypt.h'
+endif
+
+if git.found() and compiler.get_argument_syntax() == 'gcc'
+ hco_targets = []
+ foreach h : headers_to_check
+ skip_header = false
+ foreach exclude : exclude_from_check_headers
+ if h.startswith(exclude)
+ skip_header = true
+ break
+ endif
+ endforeach
+
+ if skip_header
+ continue
+ endif
+
+ hcc = custom_target(
+ input: h,
+ output: h.underscorify() + 'cc',
+ command: [
+ shell,
+ '-c',
+ 'echo \'#include "git-compat-util.h"\' > @OUTPUT@ && echo \'#include "' + h + '"\' >> @OUTPUT@'
+ ]
+ )
+
+ hco = custom_target(
+ input: hcc,
+ output: fs.replace_suffix(h.underscorify(), '.hco'),
+ command: [
+ compiler.cmd_array(),
+ libgit_c_args,
+ '-I', meson.project_source_root(),
+ '-I', meson.project_source_root() / 't/unit-tests',
+ '-o', '/dev/null',
+ '-c', '-xc',
+ '@INPUT@'
+ ]
+ )
+ hco_targets += hco
+ endforeach
+
+ alias_target('hdr-check', hco_targets)
+endif
+
foreach key, value : {
'DIFF': diff.full_path(),
'GIT_SOURCE_DIR': meson.project_source_root(),
--
2.48.1
next prev parent reply other threads:[~2025-04-20 13:19 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 14:55 [PATCH 0/3] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-08 14:55 ` [PATCH 1/3] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-08 14:55 ` [PATCH 2/3] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-08 14:55 ` [PATCH 3/3] meson: add support for 'headers-check' Karthik Nayak
2025-04-08 22:19 ` Junio C Hamano
2025-04-10 9:13 ` Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 0/4] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 1/4] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 2/4] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-11 10:06 ` Patrick Steinhardt
2025-04-11 12:13 ` Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 3/4] meson: add support for 'hdr-check' Karthik Nayak
2025-04-10 14:50 ` Phillip Wood
2025-04-10 19:06 ` Junio C Hamano
2025-04-14 13:49 ` Karthik Nayak
2025-04-11 10:06 ` Patrick Steinhardt
2025-04-14 14:03 ` Karthik Nayak
2025-04-14 8:45 ` Toon Claes
2025-04-14 14:25 ` Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 4/4] makefile/meson: add 'headers-check' as alias " Karthik Nayak
2025-04-10 14:50 ` Phillip Wood
2025-04-10 18:58 ` Junio C Hamano
2025-04-14 14:27 ` Karthik Nayak
2025-04-14 21:15 ` [PATCH v3 0/4] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-14 21:15 ` [PATCH v3 1/4] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-14 21:16 ` [PATCH v3 2/4] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-15 13:28 ` Phillip Wood
2025-04-20 10:09 ` Karthik Nayak
2025-04-14 21:16 ` [PATCH v3 3/4] meson: add support for 'hdr-check' Karthik Nayak
2025-04-14 22:11 ` Junio C Hamano
2025-04-15 6:43 ` Karthik Nayak
2025-04-15 13:28 ` phillip.wood123
2025-04-20 10:57 ` Karthik Nayak
2025-04-14 21:16 ` [PATCH v3 4/4] makefile/meson: add 'check-headers' as alias " Karthik Nayak
2025-04-15 13:28 ` phillip.wood123
2025-04-20 11:02 ` Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 0/5] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 1/5] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 2/5] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 3/5] meson: rename 'third_party_sources' to 'third_party_excludes' Karthik Nayak
2025-04-20 12:21 ` Karthik Nayak [this message]
2025-04-20 12:21 ` [PATCH v4 5/5] makefile/meson: add 'check-headers' as alias for 'hdr-check' Karthik Nayak
2025-04-21 7:48 ` [PATCH v4 0/5] meson: add corresponding target for Makefile's hdr-check Junio C Hamano
2025-04-21 8:45 ` Phillip Wood
2025-04-21 15:33 ` Karthik Nayak
2025-04-22 13:24 ` Phillip Wood
2025-04-22 14:10 ` Karthik Nayak
2025-04-22 15:55 ` Junio C Hamano
2025-04-23 1:17 ` Eli Schwartz
2025-04-23 10:04 ` Phillip Wood
2025-04-22 18:56 ` Karthik Nayak
2025-04-23 10:05 ` Phillip Wood
2025-04-21 15:41 ` Junio C Hamano
2025-04-21 18:54 ` Phillip Wood
2025-04-21 20:40 ` Junio C Hamano
2025-04-23 10:04 ` Phillip Wood
2025-04-22 6:57 ` Patrick Steinhardt
2025-04-21 20:08 ` Karthik Nayak
2025-04-21 23:33 ` Junio C Hamano
2025-04-22 9:11 ` Karthik Nayak
2025-04-22 15:56 ` Junio C Hamano
2025-04-23 8:15 ` [PATCH v5 0/6] " Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 1/6] ci/github: install git before checking out the repository Karthik Nayak
2025-04-23 10:05 ` phillip.wood123
2025-04-23 17:39 ` Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 2/6] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 3/6] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 4/6] meson: rename 'third_party_sources' to 'third_party_excludes' Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 5/6] meson: add support for 'hdr-check' Karthik Nayak
2025-04-23 10:05 ` phillip.wood123
2025-04-23 17:40 ` Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 6/6] makefile/meson: add 'check-headers' as alias " Karthik Nayak
2025-04-23 11:30 ` Patrick Steinhardt
2025-04-23 17:41 ` Karthik Nayak
2025-04-23 10:05 ` [PATCH v5 0/6] meson: add corresponding target for Makefile's hdr-check phillip.wood123
2025-04-23 17:40 ` Junio C Hamano
2025-04-23 20:04 ` Junio C Hamano
2025-04-23 20:22 ` Junio C Hamano
2025-04-23 21:22 ` Karthik Nayak
2025-04-23 21:54 ` Junio C Hamano
2025-04-23 22:12 ` Karthik Nayak
2025-04-23 17:42 ` Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250420-505-wire-up-sparse-via-meson-v4-4-66e14134e822@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
--cc=ps@pks.im \
--cc=toon@iotcl.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).