Changeset 14014


Ignorieren:
Zeitstempel:
08.01.2017 18:37:25 (vor 9 Tagen)
Autor:
er13
Nachricht:

curl:

  • add support for mbed TLS
Ort:
trunk/make/curl
Dateien:
2 bearbeitet

Legende:

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

    r13485 r14014  
    44    select FREETZ_LIB_libcrypto     if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_OPENSSL 
    55    select FREETZ_LIB_libpolarssl13 if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_POLARSSL 
     6    select FREETZ_LIB_libmbedcrypto if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_MBEDTLS 
     7    select FREETZ_LIB_libmbedtls    if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_MBEDTLS 
     8    select FREETZ_LIB_libmbedx509   if FREETZ_LIB_libcurl_WITH_SSL && FREETZ_LIB_libcurl_WITH_MBEDTLS 
    69    select FREETZ_LIB_libz          if FREETZ_LIB_libcurl_WITH_ZLIB 
    710    help 
     
    2427    config FREETZ_LIB_libcurl_WITH_POLARSSL 
    2528        bool "PolarSSL" 
     29 
     30    config FREETZ_LIB_libcurl_WITH_MBEDTLS 
     31        bool "mbed TLS" 
     32        # TODO: remove this dependency as soon as transmission supports mbed TLS (current git version already does) 
     33        depends on !FREETZ_PACKAGE_TRANSMISSION 
    2634endchoice 
    2735 
  • trunk/make/curl/curl.mk

    r13990 r14014  
    1818$(PKG)_DEPENDS_ON += polarssl13 
    1919endif 
     20ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_MBEDTLS)),y) 
     21$(PKG)_DEPENDS_ON += mbedtls 
     22endif 
    2023ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_ZLIB)),y) 
    2124$(PKG)_DEPENDS_ON += zlib 
     
    2730$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_OPENSSL 
    2831$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_POLARSSL 
     32$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_MBEDTLS 
    2933$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcurl_WITH_ZLIB 
    3034$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_CURL_STATIC 
     
    7680$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_LIB_libcurl_WITH_OPENSSL),--with-ssl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--without-ssl) 
    7781$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_LIB_libcurl_WITH_POLARSSL),--with-polarssl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--without-polarssl) 
     82$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_LIB_libcurl_WITH_MBEDTLS),--with-mbedtls="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--without-mbedtls) 
    7883$(PKG)_CONFIGURE_OPTIONS += --without-ca-bundle 
    7984$(PKG)_CONFIGURE_OPTIONS += --without-gssapi 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.