From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Nov 2024 03:56:27 +0000 (+0900)
Subject: Merge branch 'ps/upgrade-clar'
X-Git-Tag: v2.48.0-rc0~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ee7dbde67dac49f50deeb1abd743d6e0fd59e98;p=thirdparty%2Fgit.git

Merge branch 'ps/upgrade-clar'

Buildfix and upgrade of Clar to a newer version.

* ps/upgrade-clar:
  cmake: set up proper dependencies for generated clar headers
  cmake: fix compilation of clar-based unit tests
  Makefile: extract script to generate clar declarations
  Makefile: adjust sed command for generating "clar-decls.h"
  t/unit-tests: update clar to 206accb
---

1ee7dbde67dac49f50deeb1abd743d6e0fd59e98
diff --cc Makefile
index 6f5986b66e,6318ec0271..d06c9a8ffa
--- a/Makefile
+++ b/Makefile
@@@ -3905,12 -3904,9 +3905,10 @@@ GIT-TEST-SUITES: FORC
              fi
  
  $(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(CLAR_TEST_SUITES)) GIT-TEST-SUITES
- 	$(QUIET_GEN)for suite in $(CLAR_TEST_SUITES); do \
- 		sed -ne "s/^\(void test_$${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)$$\)/extern \1;/p" $(UNIT_TEST_DIR)/$$suite.c; \
- 	done >$@
+ 	$(QUIET_GEN)$(SHELL_PATH) $(UNIT_TEST_DIR)/generate-clar-decls.sh "$@" $(filter %.c,$^)
  $(UNIT_TEST_DIR)/clar.suite: $(UNIT_TEST_DIR)/clar-decls.h
  	$(QUIET_GEN)awk -f $(UNIT_TEST_DIR)/clar-generate.awk $< >$(UNIT_TEST_DIR)/clar.suite
 +$(UNIT_TEST_DIR)/clar/clar.o: $(UNIT_TEST_DIR)/clar.suite
  $(CLAR_TEST_OBJS): $(UNIT_TEST_DIR)/clar-decls.h
  $(CLAR_TEST_OBJS): EXTRA_CPPFLAGS = -I$(UNIT_TEST_DIR)
  $(CLAR_TEST_PROG): $(UNIT_TEST_DIR)/clar.suite $(CLAR_TEST_OBJS) $(GITLIBS) GIT-LDFLAGS