From: Marc Kleine-Budde <mkl@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [ptxdist] [PATCH v2 1/7] libcurl: fix configure if no SSL backend is selected
Date: Tue, 20 Sep 2022 16:17:53 +0200 [thread overview]
Message-ID: <20220920141759.3394460-2-mkl@pengutronix.de> (raw)
In-Reply-To: <20220920141759.3394460-1-mkl@pengutronix.de>
If no SSL backend is selected configure will fail with the following
error:
| configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more.
| Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls,
| --with-nss, --with-schannel, --with-secure-transport, --with-amissl,
| --with-bearssl or --with-rustls to address this.
Fixes: 34db9dd470bd ("libcurl: Version bump. 7.84.0 -> 7.85.0")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
rules/libcurl.make | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 0d0ac9ea33d0..1ddefa9a5b4e 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -105,7 +105,6 @@ LIBCURL_CONF_OPT := \
--without-brotli \
--without-zstd \
--without-gssapi \
- --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
--with-random=/dev/urandom \
--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
@@ -126,6 +125,14 @@ LIBCURL_CONF_OPT := \
--without-zsh-functions-dir \
--without-fish-functions-dir
+ifdef PTXCONF_LIBCURL_SSL
+LIBCURL_CONF_OPT += \
+ --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
+else
+LIBCURL_CONF_OPT += \
+ --without-ssl
+endif
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
--
2.30.2
next prev parent reply other threads:[~2022-09-20 14:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 14:17 [ptxdist] [PATCH 0/7] various version bumps Marc Kleine-Budde
2022-09-20 14:17 ` Marc Kleine-Budde [this message]
2022-09-22 14:00 ` [ptxdist] [PATCH v2 1/7] libcurl: fix configure if no SSL backend is selected Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 2/7] bind: version bump to 9.11.37 Marc Kleine-Budde
2022-09-22 14:50 ` Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 3/7] dhcp: version bump to 4.4.3 Marc Kleine-Budde
2022-09-22 15:20 ` Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 4/7] dnsmasq: version bump to 2.86 Marc Kleine-Budde
2022-09-28 14:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 5/7] glib: version bump to 2.72.3 Marc Kleine-Budde
2022-09-28 14:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 6/7] gnutls: version bump to 3.7.7 Marc Kleine-Budde
2022-09-28 14:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 7/7] lz4: version bump to 1.9.4 Marc Kleine-Budde
2022-09-22 14:24 ` Michael Olbrich
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=20220920141759.3394460-2-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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