From patchwork Mon Apr 14 21:15:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthik Nayak X-Patchwork-Id: 14051017 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 483562AF0A for ; Mon, 14 Apr 2025 21:16:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665369; cv=none; b=ZOIakv7mi68icSi41uo5kTQSj/qf9KU0liA1y8YqPrlpmx+SZNiHrm2Z4bxrLDLfWIIY2/15IpnsBHyOEw0Nf+Oqu9DP3u16vF4NNWJeR4Tp5Z+9kZ1dEieEn1NjPPKOMkCNKm9Bf/nqEOb0NVCceogAt6E4S2ha0lJGDeMBDBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665369; c=relaxed/simple; bh=7kVcuWgIrWUvJa1xqjcaHfpmGd73vsFMXJTLt3emX0o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MaRJHxGwhRMxkInBuPbx11EZHgPvNDWG0Fb9qLgTffkBtYa2XV1RS2z2HxDWFKN+tok2J+7rmwlWDZqOVAbPzpPGtRxBY/pI+WBbqyBfG/0GaUROhtWjaI7ucM/3PQHaeTlXXxEXIU62XQ0FoXL8eYyGys0I3zRRh+Z8/iGjMC8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EBOluhda; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EBOluhda" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5e6f4b3ebe5so8330530a12.0 for ; Mon, 14 Apr 2025 14:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744665365; x=1745270165; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=A/QnRHzqMoxjHFd3mI0dWBFcPsSwBJpyZP6TtPN4hYc=; b=EBOluhdasOoFTRGAbUdG7iIWKdCFs3vI/v2C0H5TXvDnD5/sfi4boMP8p47O8xZTjS jU04+zke64uI7BD6zZySr1GmLSLqaty1HzGmWl1W0gyDsyd4IQscoWQroYkwzkMjge4o 7+ChbHyFS3FdZhSC2oL1AyUqe9NV6nkvZnl+0XyVQ+98dutkOKe5tWvriN0vfxgD8O9j 5+NwoSst0S10S2udVCL/opiBsjSBkWo565RkkvydCzPjFFZVuIezoJjOuGICYLuiTpTY qAojUTDg3kylTCgs6P874wqjwiK2Ck7xGt6kgUKksR4SYscrVYtK0ItfAZJ7M2mZ9+CA hQ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744665365; x=1745270165; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A/QnRHzqMoxjHFd3mI0dWBFcPsSwBJpyZP6TtPN4hYc=; b=h+Rg559iYw5Ww8/jk/PGU1bcKSNLJ3JXoIVkQ59ReiTXL1PQBdFWyLCaHSOLPGaGUF S2JNi5BY8MsMCyGe/W/pEJDTwXDyQjQWNQmbBiDEF0SvNDoDTKNH+ValdKmE1q73nhUx os4VNVfVBl5BfiKjIwRLRruS1wsoTMO31iD6Hada95zjGpAwRNQDW6lruWfCoa2JYR6P AucvrQQ0UqUQyt5N0Xy/18ty3lOTsbkcE+Jd393MYkPkiW8Kl8ZJb1tjeHLEeUKrkLg1 7jRCdusoZ4P4Qv8cbNjmUBOanqYxTIGXZKyGYm7n34W+maf1EFxD5XnLJbJxYK0urwdr HiCA== X-Gm-Message-State: AOJu0YxZGrqErSK0L3OArPslN4AJBRLyRCrR9/QYKWDwm6i45fGL8MZB Dz747vzRfeG65hb4PL6fIp0avKuTE5hJwQeROrFCcZAMFn5oa41swNYa/ga5 X-Gm-Gg: ASbGncvBFzKyN6wXHRzR1ftpctCxvCvaWeP9Vdy7jIlfnJVagiW3Rl+/Wjg1AXPa8A4 ff0IBSRTK7eCAPDfUEWSgc6V6urof5Sv90tEdlFK14yJxFHCNx1dov61jdnESsYWl8WjS+nYpxF oZ8ZtvJn44UEpb0LeQKW46IwDIFzeHaHfRYWCP/fKdv/yKre6OXH7vL21KiYViqME7HJCY2rkm5 O7JSgjSZN3DQ7csnmElrMymtszKMPw9jAhRwEdsErBZJmOvqi0Ay3MQNMM4SzzUyqsy8+OIH+tt 9OLlI5D/wnyVGKf98qT8hDwO9nE2jg8CIesq9J41MXEI1p0= X-Google-Smtp-Source: AGHT+IHeWx95J3yCpw+RUEf9cdvOlkzNY7YUub4Z9dSJ+Ta7/BB8J/87Mahjcp9s1wdVoauZPhdapw== X-Received: by 2002:a05:6402:4313:b0:5db:f26d:fff1 with SMTP id 4fb4d7f45d1cf-5f36ff0476dmr10866614a12.21.1744665365411; Mon, 14 Apr 2025 14:16:05 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2455:8268:bc00:f62e:e088:2c58:70de]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ee54fb5sm5527518a12.13.2025.04.14.14.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 14:16:04 -0700 (PDT) From: Karthik Nayak Date: Mon, 14 Apr 2025 23:15:59 +0200 Subject: [PATCH v3 1/4] coccinelle: meson: rename variables to be more specific Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250414-505-wire-up-sparse-via-meson-v3-1-edc6e7f26745@gmail.com> References: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> In-Reply-To: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> To: git@vger.kernel.org Cc: Karthik Nayak , toon@iotcl.com, gitster@pobox.com, phillip.wood123@gmail.com, ps@pks.im X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1987; i=karthik.188@gmail.com; h=from:subject:message-id; bh=7kVcuWgIrWUvJa1xqjcaHfpmGd73vsFMXJTLt3emX0o=; b=owJ4nAHtARL+kA0DAAoBPtWfJI5GjH8ByyZiAGf9exKN8TxYyqVuirE9RpoqKNqrQdC89cafk DPDZxgwStjan4kBswQAAQoAHRYhBFfOTH9jdXEPy2XGBj7VnySORox/BQJn/XsSAAoJED7VnySO Rox/nz8MAJV2dNF8iro0WsPX0ciRGJH8Zh6J8DpVslgAzDyJfEnKWgEhYwP6TL9GyALeXyWyHXX e8fR7AXo+uV+RT0jhQS6/gcs40gtfylDvswUT2Dz7u8hojZ0qCqLhjrqtUtZq3HL79+86lj9REf eRAv+K2NiHcVGvuAbZdMxuQ5b62QVW19y/eEJISQp6dckM0x+WwJ/QSuIb+CAlryan0yJkWyAVL Rw6yW9tSxcbaKlrcPxMsfkFM4pU4mbFogQHPP55eoCXE/MU0227X0n8qs6HgUh1nUNM6/GRGvvi 7+ekHbWB+sOZeSXYZym+efDUQ4ItY/EXDZ/gprPrADZMGh15mg4vZQ87uQKtSJ6ECoJtdiJVtKX Bs+sYnIcIqXocTRtESDp01GxksHgPlK5OfvWp4MIrmDl2k52uDmEPD1jpbCU/l5cwpTLRv6tXZH 8ZUeUtVI6sqJqajLPFw/5Lk87KFBChWYGhjqcYiVNdGY1ceCJpLUrBtOHu4u0d435Z7hXUUinJ5 2s= X-Developer-Key: i=karthik.188@gmail.com; a=openpgp; fpr=57CE4C7F6375710FCB65C6063ED59F248E468C7F In Meson, included subdirs export their variables to top level Meson builds. In 'contrib/coccinelle/meson.build', we define two such variables `sources` and `headers`. While these variables are specific to the checks in the 'contrib/coccinelle/' directory, they also pollute the top level 'meson.build'. Rename them to be more specific, this ensures that they aren't mistakenly used in the upper levels and avoid variable name collisions. While here, change the empty list denotation to be consistent with other places. Signed-off-by: Karthik Nayak --- contrib/coccinelle/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/coccinelle/meson.build b/contrib/coccinelle/meson.build index ea054c924f..03ce52d752 100644 --- a/contrib/coccinelle/meson.build +++ b/contrib/coccinelle/meson.build @@ -55,18 +55,18 @@ concatenated_rules = custom_target( capture: true, ) -sources = [ ] +coccinelle_sources = [] foreach source : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.c', third_party_sources, check: true).stdout().split() - sources += source + coccinelle_sources += source endforeach -headers = [ ] +coccinelle_headers = [] foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split() - headers += meson.project_source_root() / header + coccinelle_headers += meson.project_source_root() / header endforeach patches = [ ] -foreach source : sources +foreach source : coccinelle_sources patches += custom_target( command: [ spatch, @@ -78,7 +78,7 @@ foreach source : sources input: meson.project_source_root() / source, output: source.underscorify() + '.patch', capture: true, - depend_files: headers, + depend_files: coccinelle_headers, ) endforeach From patchwork Mon Apr 14 21:16:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthik Nayak X-Patchwork-Id: 14051338 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAF0910F9 for ; Mon, 14 Apr 2025 21:16:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665369; cv=none; b=rFMJWN3FCgeYCn80mFwgXn/6tCq/TSLCTMW+lIxW3+udKuE/we5A66g1dSZ/8idGUVVS3e3yPj3Kcu0sik2A3tqJP0KeG6RQzS3WkTjcIZYipW5jPAxA/ICYtTLUcsAdM5fia4OgFQd+efd5b7DFoJeXQHauHiP4hRFvmljidsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665369; c=relaxed/simple; bh=e+95IPB3knNRUNiUbfCBrW3kFUIwqBobJcWY+hvhoDQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mt6yNS9EGaTyCnZvdF6NOF0C/dsMYyfRqUggxB360/ZYxPnnvGXGEntZkgr3P/WPrPZYhL2ES6y+Gub1a4R8c+3jub6AnEqGsvBJcJ9rVxMUwQ2XuUyoeO7zuPCvAunODtQlO4aGiNmb+jjsV+djO0JfhahApomQYyFDRAk4k7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IR3p3hnB; arc=none smtp.client-ip=209.85.208.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IR3p3hnB" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5e614da8615so3041324a12.1 for ; Mon, 14 Apr 2025 14:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744665366; x=1745270166; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Qt7zca6xyyA6tmgnZeVe/9iIYYImPXm7IOxdbbsEAKs=; b=IR3p3hnBjpvIVr8wfNAS6dN+vfA+uDvQUiGEkuYKFH5RFnfuZjB1ykMiewp2JxI7d2 XyXwKrTtSLbgRa578CZvVHM2azm843uxSz5ZqlruNoImQpXRT/8UVddJ5DeADsCTd6eM 0gySQpF3XL63SuucAfKE1h0mvq44rRJ2kft467gGWIRpKycTvOPlptNMmA2IdBWLBg4t tO9iRcCHWEDxaJRLwDSAR2b8QEebDeUe0bUwuiNZycDEvw38tFe77b7UPM02JZzulTB2 DfjWHSlqaLuwCwusUowUn6N9ZKNbGPv+vMhAubPL5Xy6S7wlvd08NhtCH0TZ+JcysACt GEkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744665366; x=1745270166; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qt7zca6xyyA6tmgnZeVe/9iIYYImPXm7IOxdbbsEAKs=; b=qX3wobIfXDlxY7KCcza565HWYYQhkSG1lcVnCWsQ0+khnUtE2ZTTNWIv3fOC36QvXF ErKsXenBfDq9vvj7olKHoIPzAq4HuH3fwPWKRIoecC1z/m3kdCuSSjP6bsmINWl9FQVB DBhyRcbtnqw8LJtsyEf+SXno8cKKz8DAKOZhLN7uDw9cYWIrFTwU7LLK5PrQj+qPz0y/ rai4WE8XPeTmuj3NvXsjXc6ZlLUcIpcHKdaH7OhfE4Py/63oSBDSls2TwJu15FMK58GJ dHMk+9spR8bpcZgDjlYLA4Zz+V1nh3gVvlKWSwos1cnJ/ML+m2Ce7vzO/mgtels0XSRq AIBA== X-Gm-Message-State: AOJu0YyJfG0TFPReAYej/LOhRfTygnS2d7G+OKllAJmP+tiwFCkl12q0 qZ5QpvrsIezp+q6ci/jyomNHEQcqndA9GBsGi9FCiOBVumwWLxET X-Gm-Gg: ASbGncvFUEgytmTLc/KS+NHn2n0u8W9w9utLEX54MdHKzJw62Nrk31BAImjfZm2g7t2 STEcf6gx6oSROU/UOmMlpgA6bdLC51IRe4SHVMm+sEvoNE6Vcbgm92WURHXstK8/zDtsVfsD/te qszt/Yyb2G0CKkiLos0mJPkXF9hTONnZpmFt981su1zw/9eqWcP4JXK+3UU+z9U8cMhkFT1ycqu TTHB/STLM+jIbUO/meIRQVCybnvfJ5OzC6NTOGKA2ITaxjzunKSTH/Qa1K/hvTTBBYabnLBgNar THzd9U1HdxIAurD/EMn4DN3GcWaCFZceu0cZv86hhz3CdoE= X-Google-Smtp-Source: AGHT+IF1B2shx1/Q1caqngOY/r+lTCMkwaFRM1UtCdbHUFlUSE1l0iVVg1pWnyp09LUd3xl7bv/3Ng== X-Received: by 2002:a05:6402:3482:b0:5e0:8a34:3b5c with SMTP id 4fb4d7f45d1cf-5f45ddf1f6dmr765911a12.0.1744665366153; Mon, 14 Apr 2025 14:16:06 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2455:8268:bc00:f62e:e088:2c58:70de]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ee54fb5sm5527518a12.13.2025.04.14.14.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 14:16:05 -0700 (PDT) From: Karthik Nayak Date: Mon, 14 Apr 2025 23:16:00 +0200 Subject: [PATCH v3 2/4] meson: move headers definition from 'contrib/coccinelle' Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250414-505-wire-up-sparse-via-meson-v3-2-edc6e7f26745@gmail.com> References: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> In-Reply-To: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> To: git@vger.kernel.org Cc: Karthik Nayak , toon@iotcl.com, gitster@pobox.com, phillip.wood123@gmail.com, ps@pks.im X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2966; i=karthik.188@gmail.com; h=from:subject:message-id; bh=e+95IPB3knNRUNiUbfCBrW3kFUIwqBobJcWY+hvhoDQ=; b=owJ4nAHtARL+kA0DAAoBPtWfJI5GjH8ByyZiAGf9exKxYQzMOARB6onBk7u68F8lK2jwiTWCc ZDMpM1zZ6Im6IkBswQAAQoAHRYhBFfOTH9jdXEPy2XGBj7VnySORox/BQJn/XsSAAoJED7VnySO Rox/UqQL/2hbsbrA5JhChDJ6TyvxxnrEAJGIDMq81GYyRUthiuUoOyaFd6DIG5HTaix/fPyNglQ 8aSdntYfUEPu3iISp28xstc7X2oUW/GG3uzeOkC2eHcLwU0p9lKwTwnxRgyMGb71CG+zXj05VFu tdOAbVZtZwbDZyaWXr9ahUxqFV5ojlbWp/0e0u1tih+nTvLPWxyx4Nu7FAHWBjee6xiwB6CTiFP Z9ivzO7k5oQ7ZYzjK8u6rbJ/xQdRvrHMXVN7ktnXNY1SCcMWrRC+2dunlQAFynh35LOLLTZssOW w0ZRRGJ0zlvRtNjMBfYErjP3Yuq9GARci2sZmVOxeguUGhnIW5oqOsGqZ6wGfyIGgz6tKCQYwb2 4ZB2a9dffc1/DL6+LoICnkA/gyCQFcpJ8DpmD+cmob+HU02/nDRARKxvGhB91/HwXCYqrZHNGrj AFiP6qLF/tMXuCi1t/CObmJwmineJvPdcgunPWgNHl6yZEqF7imHz+p+347bEHdclG5cSHJNLI7 G0= X-Developer-Key: i=karthik.188@gmail.com; a=openpgp; fpr=57CE4C7F6375710FCB65C6063ED59F248E468C7F The Meson build for coccinelle static analysis lists all headers to analyse. Due to the way Meson exports variables between subdirs, this variable is also available in the root Meson build. An upcoming commit, will add a new check complimenting 'hdr-check' in the Makefile. This would require the list of headers. So move the 'coccinelle_headers' to the root Meson build and rename it to 'headers', remove the root path being appended to each header and retain that in the coccinelle Meson build since it is specific to the coccinelle build. Also move the 'third_party_sources' variable to the root Meson build since it is also a dependency for the 'headers' variable. This also makes it easier to understand as the variable is now propagated from the top level to the bottom. Signed-off-by: Karthik Nayak --- contrib/coccinelle/meson.build | 17 +---------------- meson.build | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/contrib/coccinelle/meson.build b/contrib/coccinelle/meson.build index 03ce52d752..32568c5103 100644 --- a/contrib/coccinelle/meson.build +++ b/contrib/coccinelle/meson.build @@ -8,21 +8,6 @@ if not spatch.found() subdir_done() endif -third_party_sources = [ - ':!contrib', - ':!compat/inet_ntop.c', - ':!compat/inet_pton.c', - ':!compat/nedmalloc', - ':!compat/obstack.*', - ':!compat/poll', - ':!compat/regex', - ':!sha1collisiondetection', - ':!sha1dc', - ':!t/unit-tests/clar', - ':!t/unit-tests/clar', - ':!t/t[0-9][0-9][0-9][0-9]*', -] - rules = [ 'array.cocci', 'commit.cocci', @@ -61,7 +46,7 @@ foreach source : run_command(git, '-C', meson.project_source_root(), 'ls-files', endforeach coccinelle_headers = [] -foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split() +foreach header : headers coccinelle_headers += meson.project_source_root() / header endforeach diff --git a/meson.build b/meson.build index e98cfa4909..3ca5d01071 100644 --- a/meson.build +++ b/meson.build @@ -633,6 +633,28 @@ builtin_sources = [ 'builtin/write-tree.c', ] +third_party_sources = [ + ':!contrib', + ':!compat/inet_ntop.c', + ':!compat/inet_pton.c', + ':!compat/nedmalloc', + ':!compat/obstack.*', + ':!compat/poll', + ':!compat/regex', + ':!sha1collisiondetection', + ':!sha1dc', + ':!t/unit-tests/clar', + ':!t/unit-tests/clar', + ':!t/t[0-9][0-9][0-9][0-9]*', +] + +if git.found() + headers = [] + foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split() + headers += header + endforeach +endif + if not get_option('breaking_changes') builtin_sources += 'builtin/pack-redundant.c' endif From patchwork Mon Apr 14 21:16:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthik Nayak X-Patchwork-Id: 14051339 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BFA11EA84 for ; Mon, 14 Apr 2025 21:16:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665371; cv=none; b=XBTkRBJ2K8xiNlJI/RdF2xWLcwe+903QZnfxu8TP5mOhSZXFw8eaHKyYcXijUOeEVZqva9U+dyQTq3QDGNCxFAgRIR0bfVWxfguRriZsmjdQa2aOy3umEv9qwYzrGkGPghePzi3WIVBmI+y2gIbm0eg7Bt6eMoJjLnQnWsqfOvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665371; c=relaxed/simple; bh=uV1/dWMmSzGfZOJ7b+/tpG60bB3pivLrnfPtu6DcE3Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FiUpj6G4f1J8+fG9bKdKNPoPO8pWmdJU0lZb6EeRaY2ykM2d6PwV4roXa3muBk9H3T0OqJ7xcJxBeAAobu8CgiseGLvKu99uz/ESr3VFyeSfZz0Sddv8iw+IZ1xlVuRoxBpz89a5TMEhMYHOmsQpF7xfZOkmlwW6Rd2sCBLGNSo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EajUqWo2; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EajUqWo2" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e686d39ba2so8779285a12.2 for ; Mon, 14 Apr 2025 14:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744665367; x=1745270167; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Pl5SQ3yuSOoBkxKDUGmlm0X/6nK4LGxYNXUqobeHsJE=; b=EajUqWo2YRsOIkg4WjQMvQaR00mOUyE4B1kDqy0nuCnSLZj8qBNwFJ3+2CNNHwzbnI J/+LcYdwd6Cw4Y5nJvlZuEP9jKPKSxdd90boLwcZe/Zc8OGqdHLfwxyVsniFJMmbp6nq ymlBCpH94vXKQv81zWmmn4pWJQbSY7XPMpCKiSohSEXQeF+5B1c2DBNInLrgknib3X8x 0v6G3gyLT8JszSGpA7ioCEXw9s8zMwbFO2R54qU1OprjXFEEJSyP6rxWia6GtQVcu2vp B4utL+OeJGgXkOwLT3xEOFDl2KirWPZj7+bg3p9RLxuVT5DnV8dzREnNO0JtLFFai2qk ahfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744665367; x=1745270167; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pl5SQ3yuSOoBkxKDUGmlm0X/6nK4LGxYNXUqobeHsJE=; b=NjXRbLgKc1uJ7KY6U7vQRFGooXLD0D8xeKGUtW0XmzfJpJR4Fa8zI8yH+1PiSil2ZB BwnClbkc5njAgsOC1753mnFAUGdtPpvwlnRouv4ZEgNGdonLAgNR0RzPGlLCNf4Lws2n T5mryHmiUh+EubiGodlPExNNuk8lGIqh9jfv9S63XEKX21+/qLl7sphEBIW+2Wilv+ct 0VPnA7XKWe4YS12WjDtisOX1KwGcwkPItfJwvOI3/q/LoWJai9N6WCI7PCnYzOYCpASb mD44GJ6j0NfA4uif9aMasdXJfJxOYMg9NqBsh5hnRCIcjUVC0FXSiqcc41Fu0wHhdZXs yXMw== X-Gm-Message-State: AOJu0YyB6xtH2Xpqj2Lp48uR+2/RxKaAp66DPiLE4F/ADL5s1BHbnpNu WjcYTtVMEKbnW7dg6V2/vDQi53BlQw9eNpbC3xziVuFKb3+CXqLv1FhVmQn0 X-Gm-Gg: ASbGncs0gCawMfrBKd2nv/BlX76IhdUJRdbAOc9mjdotCFWyjPk6U2JfBBBcKgyxgQt 3Wrm1DsBpAnAZ3zqK9tFzOQb03POKwjFNBfGPtJR6pevSwMXNl1XWejdaCQ+noScwmiGRZxWCG5 l3dOs/wDc9yT08ilkDcajbsuf8VFhZUusYQAbgHjmPScGOAyL0z0R5gGExNeH0B6A3mZw8B6Cvu 1LBxdn3duA4UeElFF5x0NFoi7wUsjA62Ms89smAXHhhy9czF6VAg2M7ARah+ayzWWyh7PUfTEmv Ov250BGoUyBs6qj+966PHF5l1sMXirehNwtJH/86IPgannI= X-Google-Smtp-Source: AGHT+IF4L3ppw0BXErA/burZP6YWQuthaT+Q4NSN6qRW2JNQEXYX1OWNcAEoor++HX3MdV+bV360XA== X-Received: by 2002:a05:6402:2685:b0:5e4:cfe8:3502 with SMTP id 4fb4d7f45d1cf-5f36fede97bmr12652648a12.17.1744665367124; Mon, 14 Apr 2025 14:16:07 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2455:8268:bc00:f62e:e088:2c58:70de]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ee54fb5sm5527518a12.13.2025.04.14.14.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 14:16:06 -0700 (PDT) From: Karthik Nayak Date: Mon, 14 Apr 2025 23:16:01 +0200 Subject: [PATCH v3 3/4] meson: add support for 'hdr-check' Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250414-505-wire-up-sparse-via-meson-v3-3-edc6e7f26745@gmail.com> References: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> In-Reply-To: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> To: git@vger.kernel.org Cc: Karthik Nayak , toon@iotcl.com, gitster@pobox.com, phillip.wood123@gmail.com, ps@pks.im X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=3469; i=karthik.188@gmail.com; h=from:subject:message-id; bh=uV1/dWMmSzGfZOJ7b+/tpG60bB3pivLrnfPtu6DcE3Y=; b=owJ4nAHtARL+kA0DAAoBPtWfJI5GjH8ByyZiAGf9exOw64KVx+J6202T734Jw0Nu+B6VgIN+V f/uQs51j+y04IkBswQAAQoAHRYhBFfOTH9jdXEPy2XGBj7VnySORox/BQJn/XsTAAoJED7VnySO Rox/7xIMAI9/V86muApdvKgaTdR1WD2vQVrpE0rPvsMAENmufnhH8v13v5cZMLrsNQUfZaWQd1U ml3GlaTSzTfnA7XN4a9k/+Fiu4aWpEQmN0x+nFQpwaK2K2gSegji4p/H6YA3DZ6v6BQYtBiD/G3 hqFlzFlPj3oUTM/r94U8siDXxxXp73U26Tj/MF9/52PmNWYnLVEPFal3c56vubRFPeQlDPLLqwk GngGh9hs763Px1UvVRdtjyuBCkwk1ELhb6QNnL1bElW4IvaY899Q3nfZ8UcgWSrpHM0I6bHJVfi ZnerZJEx86NxaGgAZN3BJqt4SsdzT4L/M3WPNKx9+MuOoQdfLEARkuHmonWTc/FJwYChZ8C+UfW M+IzTH19l22c64NV2SwNUcyhE2snCWrLzm8JQ4bMmerBRpDpEbjnaxeZ7xyFw5pAQKtfQx74HAH EqKwRMKJ7XRTHMj4lyWgS9aFiSjqal3couGpMquPiCzW/cY7xm69yRenz/Powo4YdvYBRQQy147 XI= X-Developer-Key: i=karthik.188@gmail.com; a=openpgp; fpr=57CE4C7F6375710FCB65C6063ED59F248E468C7F 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! Signed-off-by: Karthik Nayak --- meson.build | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/meson.build b/meson.build index 3ca5d01071..b1be2b3cbb 100644 --- a/meson.build +++ b/meson.build @@ -646,6 +646,7 @@ third_party_sources = [ ':!t/unit-tests/clar', ':!t/unit-tests/clar', ':!t/t[0-9][0-9][0-9][0-9]*', + ':!xdiff', ] if git.found() @@ -655,6 +656,10 @@ if git.found() endforeach endif +generated_headers = [ + 'command-list.h', +] + if not get_option('breaking_changes') builtin_sources += 'builtin/pack-redundant.c' endif @@ -669,6 +674,7 @@ builtin_sources += custom_target( ], env: script_environment, ) +generated_headers += 'config-list.h' builtin_sources += custom_target( input: 'Documentation/githooks.adoc', @@ -681,6 +687,7 @@ builtin_sources += custom_target( ], env: script_environment, ) +generated_headers += 'hook-list.h' # This contains the variables for GIT-BUILD-OPTIONS, which we use to propagate # build options to our tests. @@ -1995,6 +2002,69 @@ endif subdir('contrib') +exclude_from_check_headers = generated_headers +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 != 'gcrpyt' + exclude_from_check_headers += 'sha256/gcrypt.h' +endif + +if git.found() and compiler.get_argument_syntax() == 'gcc' + hco_targets = [] + foreach h : headers + 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(), From patchwork Mon Apr 14 21:16:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthik Nayak X-Patchwork-Id: 14051340 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DA021EF380 for ; Mon, 14 Apr 2025 21:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665371; cv=none; b=dPb+A3/wjsZClhLMygbLqoj7xKrywPb7nKfk0fZM6jvMVMQs1p5TJUNR4JOfnBSXmxv14SFkXeMim6aWla2ZUwEaReIgBsAScHiQNjzrXtEYlFwbvH98l96mUmgj7r2+RQE1Q2d+xT62Ce42XTXtoi5G7ORgoErfrqrmIDFnSrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744665371; c=relaxed/simple; bh=+OaZAGK6cC0yUsZGLT3fNK7Eu4cgJwDuFOvNLU6gPw4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GBMNfaBfaDn+lNBD1Vg+2trQE4SZ9SXAicn0tdda7R4tLpRG/5OrOYZ1y1phND2YpSBhnsE8+pZB2RAjqDAh0eY5ScA5GQq+BDvkDIOjfZdBlFLMxUvziDDPQyCgi4QsjtHIRGEm8qBItH0C+ItA3Q6Twr/SQVocbZynF7bwd+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dApcpIzn; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dApcpIzn" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5e5c7d6b96fso8900231a12.3 for ; Mon, 14 Apr 2025 14:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744665368; x=1745270168; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oLqiSCgYiwVkB9D0K57VCKKFJTHD44AVnl05jYa28sI=; b=dApcpIzntebOtFECWEncAkBmSKqSKMzkJQexwn4XSxONXoUE2qu6JA6cFcXY7FYyjD N/1kkGCjyzRjAt++EfvxT6EgXJrB0peYtgjiUCSlshlNcxUEtNZJGx9NduZGi9D777tk xnBPltpcE7tiWePuVHfceSOkjmal54z3h0mgcH8tZI8Jvy17OAZt2++TuBDK3momPA3/ DYo/WNgO9NYOPh9xkxVycm91hI9gajmbb8BTVVEx8McvGBdjSvNPIOLKiF9gqKSmszhO 3nGmeDNQcG43bhDTjyRVDZT1AcfABxKd9Gflle/m4DuVV4RGeRiJYK04PAeglHU6TGqJ JaVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744665368; x=1745270168; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oLqiSCgYiwVkB9D0K57VCKKFJTHD44AVnl05jYa28sI=; b=MrvyBil+z4PoiBwXmZAH407MHmJpHMPwzRA2bJR6z2KZaEhtWFUXNi1TU+6QDQ0Ica sOwb16/qepWrkQWX9sKHr0xO2TeCLLdO++g34pqCDnkwoHDm1G7rKhgq2VdvVXTKJOaZ oDeitcereEmicCQUNBTu9rHGafXZPcegj2E9pN3VXrm9o+t1nbi+Ckik5SRMlCHYfgBr OURq/hrm3fARqbK0f9zi2SmexZoP6n62IZl/6uecg/GdSJmGr6IoQ7c+sMWJNz6QIO8k ffL51vILrNxP8CcTutzvzOvkroRIAXL2nIfqtRxSsNpX1mevjrRhXujHJV4KZ3ndI3QH FIVA== X-Gm-Message-State: AOJu0Yx2BbRSJtkyK5q0EQy9H6m0InavjP1bV5VAgcyPntNfCLtvened GS9HWpldNrKA7qSa5paKqvBo3nZM3b0EAb24hMTiAk4cbjN9rZBt X-Gm-Gg: ASbGncuX6v5ZKZghU0D4HpgTS+51YpYGJx7PZOCQ6JiR/RMqYr3VoTlj+6eRrOT8BJQ 6P85TjUJSvbSjsxh3NgCNANjHz4I12HNGq40g08AVWJnpbIxrCD/s4YGqYkLdnFT6UzImuadfU1 G2pEzql43PaGHpgecJUgIMjATmu3zFDQLx+STzU5oy3DOBAG5s+Mw5FVm7R2BlE0j7D71Cm+GG7 lxEo7n/1wSWlj/x+8U0wqrc8UJPnRI8WZa94fRc4SDahKeE04XMpmGXxg8GzeB1y/8c60wIXJa6 8vvX/4EdITvYuUQ0YuFNZFz8s7zre9hNwSA270znQTXflwM= X-Google-Smtp-Source: AGHT+IHsiP0dZNMzRNOm58U+JJ5mI5iu0APVz7wD1glprfAxMOVCF/56MNEEvzT9M4CjHd72V3muKA== X-Received: by 2002:a05:6402:35cc:b0:5f0:48df:25ae with SMTP id 4fb4d7f45d1cf-5f36f773f20mr11936820a12.2.1744665368358; Mon, 14 Apr 2025 14:16:08 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2455:8268:bc00:f62e:e088:2c58:70de]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ee54fb5sm5527518a12.13.2025.04.14.14.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 14:16:07 -0700 (PDT) From: Karthik Nayak Date: Mon, 14 Apr 2025 23:16:02 +0200 Subject: [PATCH v3 4/4] makefile/meson: add 'check-headers' as alias for 'hdr-check' Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250414-505-wire-up-sparse-via-meson-v3-4-edc6e7f26745@gmail.com> References: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> In-Reply-To: <20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com> To: git@vger.kernel.org Cc: Karthik Nayak , toon@iotcl.com, gitster@pobox.com, phillip.wood123@gmail.com, ps@pks.im X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1961; i=karthik.188@gmail.com; h=from:subject:message-id; bh=+OaZAGK6cC0yUsZGLT3fNK7Eu4cgJwDuFOvNLU6gPw4=; b=owJ4nAHtARL+kA0DAAoBPtWfJI5GjH8ByyZiAGf9exPkHXwV1e5KMdUYG9c+gyLDpU0fNt52O t+ZfdHXq4z0nIkBswQAAQoAHRYhBFfOTH9jdXEPy2XGBj7VnySORox/BQJn/XsTAAoJED7VnySO Rox/oaQL/2XEdKDob+atqko1PWzxHZTGyJLy+es+zShemLm3vTw1yNp9mTYZ7AB+25sGz+LmL5I U7pnx+PDZoHHbSBbCgMpScUJGe9/1gSgyeyV/9wgAzFhrEwb4UTIx6AnILnJqaG5Ez4CHZVLHjq ILXL9O8lN+iGS8omwJMRvLRAXAcQA/2FSyEKk3nQY9yhSxwT6xS2tC/2D5fWx+84LSpLlD64292 zJbz9EWhVibeuPusJ3Xb3uJX6abTU3H5kLXT6Hg6NsHmG95B6M6t1PR4ecM66weIjxWlJV8heLA 5p+Ky9ApF7hz/n12P0z+ShqavLbAziBLHgBsrvSyacerB9SixDnD/cel4IeBWdAjmIxcyUqHLU7 1EiLQ7n4xyKcTxx4WI/ZeK5WuSpthGSznY3eGlMxdGNTex3Wr6UWy06N5o8bmM8xP3eIZuDgGeN MDUDf+j4kTnpj1SLCdyIkTc3nBpKhzvyppAngkVjzrs5ci22q3HMSRMWpLTc9PGu5jMc1gaUSS8 UM= X-Developer-Key: i=karthik.188@gmail.com; a=openpgp; fpr=57CE4C7F6375710FCB65C6063ED59F248E468C7F The 'hdr-check' target in Meson and makefile is used to check if headers can be compiled individually. The naming however isn't readable as 'hdr' is not a common shortforme for 'header', neither is it an abbreviation. Let's introduce 'check-headers' as an alternative target for 'hdr-check' and add a `TODO` to deprecate the latter after 2 releases. Since this is an internal tool, we can use a shorter deprecation cycle. Change existing usage of 'hdr-check' in 'ci/run-static-analysis.sh' to also use 'check-headers'. Signed-off-by: Karthik Nayak --- Makefile | 4 +++- ci/run-static-analysis.sh | 2 +- meson.build | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ac32d2d0bd..961ee508be 100644 --- a/Makefile +++ b/Makefile @@ -3326,8 +3326,10 @@ HCC = $(HCO:hco=hcc) $(HCO): %.hco: %.hcc $(GENERATED_H) FORCE $(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $< -.PHONY: hdr-check $(HCO) +# TODO: deprecate 'hdr-check' in lieu of 'check-headers' in Git 2.51+ +.PHONY: hdr-check check-headers $(HCO) hdr-check: $(HCO) +check-headers: hdr-check .PHONY: style style: diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh index 0d51e5ce0e..60c175a094 100755 --- a/ci/run-static-analysis.sh +++ b/ci/run-static-analysis.sh @@ -26,7 +26,7 @@ then exit 1 fi -make hdr-check || +make check-headers || exit 1 make check-pot diff --git a/meson.build b/meson.build index b1be2b3cbb..745cb30165 100644 --- a/meson.build +++ b/meson.build @@ -2062,7 +2062,9 @@ if git.found() and compiler.get_argument_syntax() == 'gcc' hco_targets += hco endforeach + # TODO: deprecate 'hdr-check' in lieu of 'check-headers' in Git 2.51+ alias_target('hdr-check', hco_targets) + alias_target('check-headers', hco_targets) endif foreach key, value : {