Changeset 14695


Ignorieren:
Zeitstempel:
19.05.2018 19:08:47 (vor 5 Wochen)
Autor:
er13
Nachricht:

curl: drop PolarSSL-1.3 support, use mbed TLS instead

Ort:
trunk/make/curl
Dateien:
2 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/curl/Config.in.libs

    r14694 r14695  
    33    default n 
    44    select FREETZ_LIB_libcrypto     if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_OPENSSL 
    5     select FREETZ_LIB_libpolarssl13 if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_POLARSSL 
    65    select FREETZ_LIB_libmbedcrypto if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_MBEDTLS 
    76    select FREETZ_LIB_libmbedtls    if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_MBEDTLS 
     
    2726        select FREETZ_OPENSSL_VERSION_PROMPT 
    2827 
    29     config FREETZ_LIB_libcurl_WITH_POLARSSL 
    30         bool "PolarSSL" 
    31         depends on !FREETZ_PACKAGE_TRANSMISSION 
    32  
    3328    config FREETZ_LIB_libcurl_WITH_MBEDTLS 
    3429        bool "mbed TLS" 
  • trunk/make/curl/curl.mk

    r14690 r14695  
    1515$(PKG)_DEPENDS_ON += openssl 
    1616endif 
    17 ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_POLARSSL)),y) 
    18 $(PKG)_DEPENDS_ON += polarssl13 
    19 endif 
    2017ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_MBEDTLS)),y) 
    2118$(PKG)_DEPENDS_ON += mbedtls 
     
    2825endif 
    2926 
    30 $(PKG)_PATCH_POST_CMDS += $(call POLARSSL_HARDCODE_VERSION,13,configure lib/urldata.h lib/vtls/polarssl.h lib/vtls/polarssl.c) 
    31  
    3227$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_SSL 
    3328$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_OPENSSL 
    34 $(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_POLARSSL 
    3529$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_MBEDTLS 
    3630$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_SFTP 
     
    8478$(PKG)_CONFIGURE_OPTIONS += --without-cyassl 
    8579$(PKG)_CONFIGURE_OPTIONS += --without-gnutls 
     80$(PKG)_CONFIGURE_OPTIONS += --without-polarssl 
    8681$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_LIB_libcurl_WITH_OPENSSL),--with-ssl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--without-ssl) 
    87 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_LIB_libcurl_WITH_POLARSSL),--with-polarssl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--without-polarssl) 
    8882$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_LIB_libcurl_WITH_MBEDTLS),--with-mbedtls="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--without-mbedtls) 
    8983$(PKG)_CONFIGURE_OPTIONS += --without-ca-bundle 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.