From: "Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, gitster@pobox.com,
Victoria Dye <vdye@github.com>, Victoria Dye <vdye@github.com>
Subject: [PATCH] contrib/scalar: fix 'all' target in Makefile
Date: Tue, 05 Apr 2022 22:35:36 +0000 [thread overview]
Message-ID: <pull.1205.git.1649198136190.gitgitgadget@gmail.com> (raw)
From: Victoria Dye <vdye@github.com>
Add extra ':' to second 'all' target definition to allow 'scalar' to build.
Without this fix, the 'all:' and 'all::' targets together cause a build
failure when 'scalar' build is enabled with 'INCLUDE_SCALAR':
Makefile:14: *** target file `all' has both : and :: entries. Stop.
Signed-off-by: Victoria Dye <vdye@github.com>
---
contrib/scalar: fix 'all' target in Makefile
This patch fixes an issue introduced in a36b575aab (scalar Makefile: use
"The default target of..." pattern, 2022-03-03) in which an 'all::'
target was added without converting the existing 'all:' (single-colon)
target into an 'all::' (double-colon) target. This causes a build error,
but only when compiling with 'INCLUDE_SCALAR' enabled. As a result, I
only just found it when building 'scalar' on the 'microsoft/git' fork.
Although 'INCLUDE_SCALAR' isn't enabled by default, we should fix the
build error for anyone that may intentionally build with it. If
possible, it would be nice to have this merged before the final v2.36.0
so that users don't run into the error in the next release.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1205%2Fvdye%2Fbugfix%2Fscalar-all-target-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1205/vdye/bugfix/scalar-all-target-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1205
contrib/scalar/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile
index 5e86d78e19b..37f283f35d7 100644
--- a/contrib/scalar/Makefile
+++ b/contrib/scalar/Makefile
@@ -11,7 +11,7 @@ include ../../config.mak.uname
TARGETS = scalar$(X) scalar.o
GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
-all: scalar$(X) ../../bin-wrappers/scalar
+all:: scalar$(X) ../../bin-wrappers/scalar
$(GITLIBS):
$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@)
base-commit: faa21c10d44184f616d391c158dcbb13b9c72ef3
--
gitgitgadget
next reply other threads:[~2022-04-06 6:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-05 22:35 Victoria Dye via GitGitGadget [this message]
2022-04-06 8:21 ` [PATCH] contrib/scalar: fix 'all' target in Makefile Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1205.git.1649198136190.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vdye@github.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).