From: "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
Philippe Blain <levraiphilippeblain@gmail.com>,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: [PATCH] Makefile: fix dependency for $(UNIT_TEST_DIR)/clar/clar.o
Date: Mon, 07 Oct 2024 17:43:53 +0000 [thread overview]
Message-ID: <pull.1810.git.1728323033680.gitgitgadget@gmail.com> (raw)
From: Philippe Blain <levraiphilippeblain@gmail.com>
The clar source file '$(UNIT_TEST_DIR)/clar/clar.c' includes the
generated 'clar.suite', but this dependency is not taken into account by
our Makefile, so that it is possible for a parallel build to fail if
Make tries to build 'clar.o' before 'clar.suite' is generated.
Correctly specify the dependency.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
Makefile: fix dependency for $(UNIT_TEST_DIR)/clar/clar.o
Hi Patrick,
I tried building v2.47.0 and stumbled onto this small issue. It
reproduces for me from a fresh clone on my old 2009 Mac with make -j -l
2.5, it's a little curious that no one ran into this yet.
I found it best to declare the dependency directly on clar.o, instead of
adjusting the dependencies of CLAR_TEST_OBJS on the line above, since it
is really only this clar.c that includes clar.suite
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1810%2Fphil-blain%2Fclar-build-dep-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1810/phil-blain/clar-build-dep-fix-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1810
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 2dde1fd2b8b..b615de74811 100644
--- a/Makefile
+++ b/Makefile
@@ -3911,6 +3911,7 @@ $(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(CLAR_TEST_SUI
$(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
$(CLAR_TEST_OBJS): $(UNIT_TEST_DIR)/clar-decls.h
+$(UNIT_TEST_DIR)/clar/clar.o: $(UNIT_TEST_DIR)/clar.suite
$(CLAR_TEST_OBJS): EXTRA_CPPFLAGS = -I$(UNIT_TEST_DIR)
$(CLAR_TEST_PROG): $(UNIT_TEST_DIR)/clar.suite $(CLAR_TEST_OBJS) $(GITLIBS) GIT-LDFLAGS
$(call mkdir_p_parent_template)
base-commit: 777489f9e09c8d0dd6b12f9d90de6376330577a2
--
gitgitgadget
next reply other threads:[~2024-10-07 17:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 17:43 Philippe Blain via GitGitGadget [this message]
2024-10-08 0:53 ` [PATCH] Makefile: fix dependency for $(UNIT_TEST_DIR)/clar/clar.o Junio C Hamano
2024-10-08 3:58 ` Patrick Steinhardt
2024-10-10 12:04 ` Philippe Blain
2024-10-10 18:50 ` Junio C Hamano
2024-10-11 17:29 ` [PATCH v2] " Philippe Blain via GitGitGadget
2024-10-14 11:59 ` Patrick Steinhardt
2024-10-15 0:34 ` Taylor Blau
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=pull.1810.git.1728323033680.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=ps@pks.im \
/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).