From nobody Sun Feb 8 23:06:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893641; cv=none; d=zohomail.com; s=zohoarc; b=KblVRH0avHFVQzG+knELDEWm8uEirBYJHEVlJUVzytrvZssHPonHxTFJBJTItlpAYQa3NFc7U94BErgDa+g+T6ATM+vjPARkinyhiRqR0KSLrzxl+VKZmbvMNt48+J/uvC3/sOt16gl6+FMw006Fs63LGs8tEipvXvRXqMuyodU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893641; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CO2iiWEgMCFMleHY8fx63/wZo54HRvFb6w/ItllRjf4=; b=PJQnW4ZhAWeChIefyYiKZwFyUry1v2P4/4TPV4krWGDgkiTo42KdkrHDkyFIBFqwstHQmir8tRCytJw4atTLCWBGGmiRBSYrGvdR+AxGxukcKNbI4Ej4k5riq8TgqG7lOeAhS97KW8eekYrhBRoLU84JSovI+p2afIRmFeKvNug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594893641237581.6564295817274; Thu, 16 Jul 2020 03:00:41 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-ODreIoozPsmr-Jfl8c7irA-1; Thu, 16 Jul 2020 06:00:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 249CE100526A; Thu, 16 Jul 2020 10:00:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 028E578525; Thu, 16 Jul 2020 10:00:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C1E6C1800FDE; Thu, 16 Jul 2020 10:00:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA012B015083 for ; Thu, 16 Jul 2020 06:00:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E1082B6E2; Thu, 16 Jul 2020 10:00:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBDDD2B6DC for ; Thu, 16 Jul 2020 10:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893640; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CO2iiWEgMCFMleHY8fx63/wZo54HRvFb6w/ItllRjf4=; b=c1TbJFKhxY0s4qn0tFEkIM9fp41yRRKJE2YIy10OBLH1yT6QY68ctLbBJJhYcnFsSJba6S UzARaziLN9J+laT1dO6P9jsOAsqaAv9UrSG2c8bV2tYQbC0xZE3gxZYqF3J37+5rDCGdBx fQyBFr12Zo9aKN8/6/svrz9AyD5u2K0= X-MC-Unique: ODreIoozPsmr-Jfl8c7irA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 006/351] meson: syntax-check: drop Makefile and m4 related checks Date: Thu, 16 Jul 2020 11:54:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Rewrite to meson will eliminate most of the Makefile and all of m4 files so there is no need to check them. We still need to ignore mk files otherwise syntax-check.mk would be considered as well. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- build-aux/syntax-check.mk | 58 ++------------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index bf229c42a74..3d7b644f01f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -785,14 +785,6 @@ sc_spec_indentation: echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ fi =20 -# Nested conditionals are easier to understand if we enforce that endifs -# can be paired back to the if -sc_makefile_conditionals: - @prohibit=3D'(else|endif)($$| *#)' \ - in_vc_files=3D'Makefile\.am' \ - halt=3D'match "if FOO" with "endif FOO" in Makefiles' \ - $(_sc_search_regexp) - # Long lines can be harder to diff; too long, and git send-email chokes. # For now, only enforce line length on files where we have intentionally # fixed things and don't want to regress. @@ -801,10 +793,6 @@ sc_prohibit_long_lines: in_vc_files=3D'\.arg[sv]' \ halt=3D'Wrap long lines in expected output files' \ $(_sc_search_regexp) - @prohibit=3D'.{80}' \ - in_vc_files=3D'Makefile(\.inc)?\.am' \ - halt=3D'Wrap long lines in Makefiles' \ - $(_sc_search_regexp) =20 sc_copyright_format: @require=3D'Copyright .*Red 'Hat', Inc\.' \ @@ -1793,40 +1781,6 @@ sc_const_long_option: halt=3D'add "const" to the above declarations' \ $(_sc_search_regexp) =20 -# Ensure that we use only the standard $(VAR) notation, -# not @...@ in Makefile.am, now that we can rely on automake -# to emit a definition for each substituted variable. -# However, there is still one case in which @VAR@ use is not just -# legitimate, but actually required: when augmenting an automake-defined -# variable with a prefix. For example, gettext uses this: -# MAKEINFO =3D env LANG=3D LC_MESSAGES=3D LC_ALL=3D LANGUAGE=3D @MAKEINFO@ -# otherwise, makeinfo would put German or French (current locale) -# navigation hints in the otherwise-English documentation. -# -# Allow the package to add exceptions via a hook in syntax-check.mk; -# for example, @PRAGMA_SYSTEM_HEADER@ can be permitted by -# setting this to ' && !/PRAGMA_SYSTEM_HEADER/'. -_makefile_at_at_check_exceptions ?=3D -sc_makefile_at_at_check: - @perl -ne '/\@\w+\@/' \ - -e ' && !/(\w+)\s+=3D.*\@\1\@$$/' \ - -e ''$(_makefile_at_at_check_exceptions) \ - -e 'and (print "$$ARGV:$$.: $$_"), $$m=3D1; END {exit !$$m}' \ - $$($(VC_LIST_EXCEPT) | $(GREP) -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \ - && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || : - -sc_makefile_TAB_only_indentation: - @prohibit=3D'^ [ ]{8}' \ - in_vc_files=3D'akefile|\.mk$$' \ - halt=3D'found TAB-8-space indentation' \ - $(_sc_search_regexp) - -sc_m4_quote_check: - @prohibit=3D'(AC_DEFINE(_UNQUOTED)?|AC_DEFUN)\([^[]' \ - in_vc_files=3D'(^configure\.ac|\.m4)$$' \ - halt=3D'quote the first arg to AC_DEF*' \ - $(_sc_search_regexp) - gen_source_files: $(MAKE) -C src generated-sources =20 @@ -1839,8 +1793,8 @@ perl_translatable_files_list_ =3D \ -e 'foreach $$file (@ARGV) {' \ -e ' \# Consider only file extensions with one or two letters' \ -e ' $$file =3D~ /\...?$$/ or next;' \ - -e ' \# Ignore m4 and mk files' \ - -e ' $$file =3D~ /\.m[4k]$$/ and next;' \ + -e ' \# Ignore mk files' \ + -e ' $$file =3D~ /\.mk$$/ and next;' \ -e ' \# Ignore a .c or .h file with a corresponding .l or .y file' \ -e ' $$file =3D~ /(.+)\.[ch]$$/ && (-e "$${1}.l" || -e "$${1}.y")' \ -e ' and next;' \ @@ -1993,12 +1947,6 @@ exclude_file_name_regexp--sc_po_check =3D ^(docs/|sr= c/rpc/gendispatch\.pl$$|tests/ exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY =3D \ ^(build-aux/syntax-check\.mk|include/libvirt/virterror\.h|src/remote/rem= ote_daemon_dispatch\.c|src/util/virerror\.c|docs/internals/oomtesting\.html= \.in)$$ =20 -exclude_file_name_regexp--sc_makefile_TAB_only_indentation =3D \ - ^build-aux/syntax-check\.mk$$ - -exclude_file_name_regexp--sc_makefile_at_at_check =3D \ - ^build-aux/syntax-check\.mk$$ - exclude_file_name_regexp--sc_prohibit_PATH_MAX =3D \ ^build-aux/syntax-check\.mk$$ =20 @@ -2076,8 +2024,6 @@ exclude_file_name_regexp--sc_size_of_brackets =3D bui= ld-aux/syntax-check\.mk exclude_file_name_regexp--sc_correct_id_types =3D \ (^src/locking/lock_protocol.x$$) =20 -exclude_file_name_regexp--sc_m4_quote_check =3D m4/virt-lib.m4 - exclude_file_name_regexp--sc_prohibit_include_public_headers_quote =3D \ ^(src/internal\.h$$|tools/wireshark/src/packet-libvirt.c$$) =20 --=20 2.26.2