From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 20 Sep 2022 16:18:20 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oae4q-00AWKy-PJ for lore@lore.pengutronix.de; Tue, 20 Sep 2022 16:18:20 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oae4q-0002Ba-0Q; Tue, 20 Sep 2022 16:18:20 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oae4Y-0001vL-CN; Tue, 20 Sep 2022 16:18:02 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oae4Z-001sZx-2f; Tue, 20 Sep 2022 16:18:01 +0200 Received: from localhost ([::1] helo=blackshift.org) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oae4W-00EFkm-Q7; Tue, 20 Sep 2022 16:18:00 +0200 From: Marc Kleine-Budde To: ptxdist@pengutronix.de Date: Tue, 20 Sep 2022 16:17:53 +0200 Message-Id: <20220920141759.3394460-2-mkl@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220920141759.3394460-1-mkl@pengutronix.de> References: <20220920141759.3394460-1-mkl@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2 1/7] libcurl: fix configure if no SSL backend is selected X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Marc Kleine-Budde Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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