{"thread":{"id":"57673","subject":"[PATCH] contrib/scalar: fix 'all' target in Makefile","startedAt":"2022-04-06T05:07:47Z","lastAt":"2022-04-06T11:41:38Z","messageCount":2,"participants":["Victoria Dye via GitGitGadget","Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"453151","messageId":"pull.1205.git.1649198136190.gitgitgadget@gmail.com","threadId":"57673","inReplyTo":null,"subject":"[PATCH] contrib/scalar: fix 'all' target in Makefile","fromName":"Victoria Dye via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-04-05T22:35:36Z","receivedAt":"2022-04-06T05:07:47Z","isPatch":true,"sender":{"key":"vdye@github.com","avatar":"https://avatars.githubusercontent.com/u/3619353?v=4"},"body":"From: Victoria Dye <vdye@github.com>\n\nAdd extra ':' to second 'all' target definition to allow 'scalar' to build.\nWithout this fix, the 'all:' and 'all::' targets together cause a build\nfailure when 'scalar' build is enabled with 'INCLUDE_SCALAR':\n\n    Makefile:14: *** target file `all' has both : and :: entries.  Stop.\n\nSigned-off-by: Victoria Dye <vdye@github.com>\n---\n    contrib/scalar: fix 'all' target in Makefile\n    \n    This patch fixes an issue introduced in a36b575aab (scalar Makefile: use\n    \"The default target of...\" pattern, 2022-03-03) in which an 'all::'\n    target was added without converting the existing 'all:' (single-colon)\n    target into an 'all::' (double-colon) target. This causes a build error,\n    but only when compiling with 'INCLUDE_SCALAR' enabled. As a result, I\n    only just found it when building 'scalar' on the 'microsoft/git' fork.\n    \n    Although 'INCLUDE_SCALAR' isn't enabled by default, we should fix the\n    build error for anyone that may intentionally build with it. If\n    possible, it would be nice to have this merged before the final v2.36.0\n    so that users don't run into the error in the next release.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1205%2Fvdye%2Fbugfix%2Fscalar-all-target-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1205/vdye/bugfix/scalar-all-target-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1205\n\n contrib/scalar/Makefile | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile\nindex 5e86d78e19b..37f283f35d7 100644\n--- a/contrib/scalar/Makefile\n+++ b/contrib/scalar/Makefile\n@@ -11,7 +11,7 @@ include ../../config.mak.uname\n TARGETS = scalar$(X) scalar.o\n GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a\n \n-all: scalar$(X) ../../bin-wrappers/scalar\n+all:: scalar$(X) ../../bin-wrappers/scalar\n \n $(GITLIBS):\n \t$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@)\n\nbase-commit: faa21c10d44184f616d391c158dcbb13b9c72ef3\n-- \ngitgitgadget\n"},{"id":"453158","messageId":"220406.861qyafwer.gmgdl@evledraar.gmail.com","threadId":"57673","inReplyTo":"pull.1205.git.1649198136190.gitgitgadget@gmail.com","subject":"Re: [PATCH] contrib/scalar: fix 'all' target in Makefile","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-04-06T08:21:14Z","receivedAt":"2022-04-06T11:41:38Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Tue, Apr 05 2022, Victoria Dye via GitGitGadget wrote:\n\n> From: Victoria Dye <vdye@github.com>\n>\n> Add extra ':' to second 'all' target definition to allow 'scalar' to build.\n> Without this fix, the 'all:' and 'all::' targets together cause a build\n> failure when 'scalar' build is enabled with 'INCLUDE_SCALAR':\n>\n>     Makefile:14: *** target file `all' has both : and :: entries.  Stop.\n\nThanks for the fix, and sorry.\n\nI missed this because I build and install scalar locally with a patch on\ntop[1] to integrate it into the main Makefile, so I wasn't running this\npart, even if I was building, testing and installing it as part of my\nlocal build.\n\n1. https://lore.kernel.org/git/patch-1.1-86fb8d56307-20211028T185016Z-avarab@gmail.com/\n"}]}