Skip to contentSkip to conversation

libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice

PATCH New Trent Piepho 2 participants 2 messages Nov 13, 2018

lore
Share & tools
lore

Trent Piepho

author
#0 lore raw

PATCH 1/1 libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice

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 <[email protected]>
---
 package/libcurl/libcurl.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
package/libcurl/libcurl.mk +3 -4
index b6b8e0abc8..5aa6d542ad 100644
@@ -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
Signature · 1 line
2.14.4
#1 lore raw

PATCH 1/1 libcurl: Don't need --without-(ssl/gnutls/nss/mbedtls) twice

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Trent" == Trent Piepho <[email protected]> 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 <[email protected]>

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard