From: Junio C Hamano <gitster@pobox.com>
To: <rsbecker@nexbridge.com>
Cc: "'Randall S. Becker'" <the.n.e.key@gmail.com>,
<git@vger.kernel.org>,
"'Randall S. Becker'" <randall.becker@nexbridge.ca>
Subject: Re: [PATCH v0 1/1] Teach git version --build-options about zlib+libcurl
Date: Fri, 21 Jun 2024 22:11:12 -0700 [thread overview]
Message-ID: <xmqqtthlimtr.fsf@gitster.g> (raw)
In-Reply-To: <xmqqplsaje6z.fsf@gitster.g> (Junio C. Hamano's message of "Fri, 21 Jun 2024 12:20:04 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Unfortunately, we cannot use the same trick, i.e. "Makefile
> knows not to even compile when NO_CURL is set", as this change is to
> help.c and we cannot say "if you do not have libcURL, you do not get
> any help" ;-)
>
> #ifndef NO_CURL
> #include "git-curl-compat.h"
> #endif
>
> may be a simplest workaround, as Makefile does this:
>
> ifdef NO_CURL
> BASIC_CFLAGS += -DNO_CURL
> ...
So, the version I queued looks like so:
diff --git a/help.c b/help.c
index ce55aaa2c0..92bfef140b 100644
--- a/help.c
+++ b/help.c
@@ -15,6 +15,10 @@
#include "prompt.h"
#include "fsmonitor-ipc.h"
+#ifndef NO_CURL
+#include "git-curl-compat.h" /* For LIBCURL_VERSION only */
+#endif
+
struct category_description {
uint32_t category;
const char *desc;
@@ -757,6 +761,9 @@ void get_version_info(struct strbuf ...
if (fsmonitor_ipc__is_supported())
strbuf_addstr(buf, "feature: fsmonitor--daemon\n");
+#if defined LIBCURL_VERSION
+ strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION);
+#endif
#if defined OPENSSL_VERSION_TEXT
strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT);
#endif
but then there are a few "side builds" at GitHub CI, one of which is
"minimum fuzzer" build. It compiles bunch of object files without
giving much build options but the final target of the build is not
"git" but something else [*]. And because the job is not interesting
in building a working "git", the environment does not install libcURL,
leading to a failed build.
I sent a separate patch to address this build failure, which is
found at https://lore.kernel.org/git/xmqqwmmhimxx.fsf@gitster.g/
[Reference]
* https://github.com/git/git/actions/runs/9623017127/job/26544995557
next prev parent reply other threads:[~2024-06-22 5:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-21 15:45 [PATCH v0 0/1] Teach git version --build-options about zlib+libcurl Randall S. Becker
2024-06-21 15:45 ` [PATCH v0 1/1] " Randall S. Becker
2024-06-21 18:20 ` Junio C Hamano
2024-06-21 18:28 ` Junio C Hamano
2024-06-21 18:33 ` rsbecker
2024-06-21 18:58 ` Junio C Hamano
2024-06-21 19:20 ` Junio C Hamano
2024-06-21 19:32 ` Randall Becker
2024-06-22 5:11 ` Junio C Hamano [this message]
2024-06-25 19:29 ` rsbecker
2024-06-25 20:58 ` Junio C Hamano
2024-06-25 22:02 ` rsbecker
2024-06-26 20:42 ` Jeff King
2024-06-26 22:28 ` Junio C Hamano
2024-06-26 20:46 ` Jeff King
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=xmqqtthlimtr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=randall.becker@nexbridge.ca \
--cc=rsbecker@nexbridge.com \
--cc=the.n.e.key@gmail.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.
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).