* [Buildroot] [PATCH] libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice
@ 2018-11-13 0:24 Trent Piepho
2018-11-13 7:26 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Trent Piepho @ 2018-11-13 0:24 UTC (permalink / raw)
To: buildroot
Remove the --without-* options from the yes side of the TLS libraries
selection checks.
Since the --without-* option is now specified when the corresponding TLS
library is not being used, it's no longer necessary when enabling a TLS
library to explicity list all the other TLS libs that curl should not
use.
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
---
package/libcurl/libcurl.mk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index b6b8e0abc8..5aa6d542ad 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -50,14 +50,14 @@ LIBCURL_CONF_OPTS += -without-ssl
endif
ifeq ($(BR2_PACKAGE_LIBCURL_GNUTLS),y)
-LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr --without-ssl
+LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
LIBCURL_DEPENDENCIES += gnutls
else
LIBCURL_CONF_OPTS += --without-gnutls
endif
ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y)
-LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr --without-ssl --without-gnutls
+LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr
LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`"
LIBCURL_DEPENDENCIES += libnss
else
@@ -65,8 +65,7 @@ LIBCURL_CONF_OPTS += --without-nss
endif
ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y)
-LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr \
- --without-ssl --without-gnutls --without-nss
+LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr
LIBCURL_DEPENDENCIES += mbedtls
else
LIBCURL_CONF_OPTS += --without-mbedtls
--
2.14.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice
2018-11-13 0:24 [Buildroot] [PATCH] libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice Trent Piepho
@ 2018-11-13 7:26 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2018-11-13 7:26 UTC (permalink / raw)
To: buildroot
>>>>> "Trent" == Trent Piepho <tpiepho@impinj.com> writes:
> Remove the --without-* options from the yes side of the TLS libraries
> selection checks.
> Since the --without-* option is now specified when the corresponding TLS
> library is not being used, it's no longer necessary when enabling a TLS
> library to explicity list all the other TLS libs that curl should not
> use.
> Signed-off-by: Trent Piepho <tpiepho@impinj.com>
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-13 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-13 0:24 [Buildroot] [PATCH] libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice Trent Piepho
2018-11-13 7:26 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.