@matheusbsbs / matheus-bagliano / commits / 09d9a69e31

Makefile: have "coccicheck" re-run if flags change

Fix an issue with the "coccicheck" family of rules that's been here since 63f0a758a06 (add coccicheck make target, 2016-09-15), unlike e.g. "make grep.o" we wouldn't re-run it when $(SPATCH) or $(SPATCH_FLAGS) changed. To test new flags we needed to first do a "make cocciclean". This now uses the same (copy/pasted) pattern as other "DEFINES" rules. As a result we'll re-run properly. This can be demonstrated e.g. on the issue noted in [1]: $ make contrib/coccinelle/xcalloc.cocci.patch COCCI_SOURCES=promisor-remote.c V=1 [...] SPATCH contrib/coccinelle/xcalloc.cocci $ make contrib/coccinelle/xcalloc.cocci.patch COCCI_SOURCES=promisor-remote.c SPATCH_FLAGS="--all-includes --recursive-includes" * new spatch flags SPATCH contrib/coccinelle/xcalloc.cocci SPATCH result: contrib/coccinelle/xcalloc.cocci.patch $ 1. https://lore.kernel.org/git/20220823095602.GC1735@szeder.dev/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>

Ævar Arnfjörð Bjarmason committed Nov 1, 2022 at 23:35 UTC 09d9a69e31f2249ba8500250b9bc3ba532685126
2 files changed +16
.gitignore
+1
@@ -10,6 +10,7 @@
10 /GIT-PERL-HEADER
11 /GIT-PYTHON-VARS
12 /GIT-SCRIPT-DEFINES
13 +/GIT-SPATCH-DEFINES
14 /GIT-USER-AGENT
15 /GIT-VERSION-FILE
16 /bin-wrappers/
Makefile
+15
@@ -1300,6 +1300,18 @@ SANITIZE_ADDRESS =
1300 SPATCH_FLAGS = --all-includes
1301 SPATCH_BATCH_SIZE = 1
1302
1303 +# Rebuild 'coccicheck' if $(SPATCH), its flags etc. change
1304 +TRACK_SPATCH_DEFINES =
1305 +TRACK_SPATCH_DEFINES += $(SPATCH)
1306 +TRACK_SPATCH_DEFINES += $(SPATCH_FLAGS)
1307 +TRACK_SPATCH_DEFINES += $(SPATCH_BATCH_SIZE)
1308 +GIT-SPATCH-DEFINES: FORCE
1309 + @FLAGS='$(TRACK_SPATCH_DEFINES)'; \
1310 + if test x"$$FLAGS" != x"`cat GIT-SPATCH-DEFINES 2>/dev/null`" ; then \
1311 + echo >&2 " * new spatch flags"; \
1312 + echo "$$FLAGS" >GIT-SPATCH-DEFINES; \
1313 + fi
1314 +
1315 include config.mak.uname
1316 -include config.mak.autogen
1317 -include config.mak
@@ -3151,6 +3163,7 @@ COCCICHECK_PATCHES_PENDING = $(COCCICHECK_PENDING:%=%.patch)
3163 COCCI_TEST_RES = $(wildcard contrib/coccinelle/tests/*.res)
3164
3165 COCCI_PATCHES = $(COCCI_RULES:%=%.patch)
3166 +$(COCCI_PATCHES): GIT-SPATCH-DEFINES
3167 $(COCCI_PATCHES): $(COCCI_SOURCES)
3168 $(COCCI_PATCHES): %.patch: %
3169 $(QUIET_SPATCH) \
@@ -3174,6 +3187,7 @@ $(COCCI_PATCHES): %.patch: %
3187 fi
3188
3189 COCCI_TEST_RES_GEN = $(addprefix .build/,$(COCCI_TEST_RES))
3190 +$(COCCI_TEST_RES_GEN): GIT-SPATCH-DEFINES
3191 $(COCCI_TEST_RES_GEN): .build/%.res : %.c
3192 $(COCCI_TEST_RES_GEN): .build/%.res : %.res
3193 $(COCCI_TEST_RES_GEN): .build/contrib/coccinelle/tests/%.res : contrib/coccinelle/%.cocci
@@ -3460,6 +3474,7 @@ profile-clean:
3474 $(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
3475
3476 cocciclean:
3477 + $(RM) GIT-SPATCH-DEFINES
3478 $(RM) -r .build/contrib/coccinelle
3479 $(RM) contrib/coccinelle/*.cocci.patch*
3480