On Tue, Sep 20, 2022 at 04:20:35PM +0200, Marc Kleine-Budde wrote:
> On 20.09.2022 16:14:32, Michael Olbrich wrote:
> > On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote:
> > > On 20.09.2022 15:07:22, Alexander Dahl wrote:
> > > > Hello Marc,
> > > >
> > > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> > > > > Signed-off-by: Marc Kleine-Budde <m...@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
> > > >
> > > > The diff does not match patch subject.
> > >
> > > Oh, the version bump disappeared after rebasing to current master. Will
> > > send a v2.
> >
> > Why do you need this stuff anyways? From looking at configure.ac, the
> > existing options should work. What am I missing here?
>
> If configure is called with '--with-default-ssl-backend="no"' it fails:
>
> | checking if GSS-API support is requested... no
> | checking whether to enable Windows native SSL/TLS... no
> | checking whether to enable Secure Transport... no
> | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> | 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.
I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
backend conditional.
Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
inserted at the correct place.
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
