mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
47659be5b8
lwip was added to common requirements list to provide "sys/socket.h" header to all components without additional requirements specified. However, lwip pulls in a lot of dependencies on other components. This commit removes lwip from common requirements to reduce the number of components in G1-only apps. To compensate for this removal, the following changes are made: - newlib (which is a common requirement) has a public dependency on lwip if lwip is present in the build. This ensures that sys/socket.h is available as long as lwip component is included into the build. - lwip is now a public requirement of esp-tls since esp_tls.h includes sys/socket.h header. - lwip is now a public requirement o esp_http_client because sys/socket.h is included from esp_http_client.h - lwip is now a private requirement of esp_wifi for "smartconfig_ack" - lwip is now a private requirement of mqtt for socket functions - lwip is now a public requirement of tcp_transport because esp_transport_tcp.h includes sys/socket.h header. - mbedtls checks if lwip component is present in the build. If yes, net_sockets.c is added to the build, along with the dependency on lwip. Previously lwip was a public requirement of mbedtls unconditionally. system/g1_components test app is updated to reflect the changes Default public dependencies of a component before and after this change, except common requirements: - esp_timer (public dependency of freertos) - bootloader_support (public dependency of esp_hw_support) - vfs (public dependency of lwip) - esp_wifi (public dependency of lwip) - esp_event (public dependency of esp_wifi) - esp_netif (public dependency of esp_event) - esp_eth (public dependency of esp_netif) - esp_phy (public dependency of esp_wifi) After: - esp_timer (public dependency of freertos) - bootloader_support (public dependency of esp_hw_support) Altogether, the following components have been always added as public requirements to all other components, and are not added now ([breaking-change]): - lwip - vfs - esp_wifi - esp_event - esp_netif - esp_eth - esp_phy Application components now need to explicitly declare dependencies on these components.
29 lines
1.1 KiB
CMake
29 lines
1.1 KiB
CMake
set(srcs esp_tls.c esp-tls-crypto/esp_tls_crypto.c esp_tls_error_capture.c)
|
|
if(CONFIG_ESP_TLS_USING_MBEDTLS)
|
|
list(APPEND srcs
|
|
"esp_tls_mbedtls.c")
|
|
endif()
|
|
|
|
if(CONFIG_ESP_TLS_USING_WOLFSSL)
|
|
list(APPEND srcs
|
|
"esp_tls_wolfssl.c")
|
|
endif()
|
|
|
|
idf_component_register(SRCS "${srcs}"
|
|
INCLUDE_DIRS . esp-tls-crypto
|
|
PRIV_INCLUDE_DIRS "private_include"
|
|
# lwip and mbedtls are public requirements becasue esp_tls.h
|
|
# includes sys/socket.h and mbedtls header files.
|
|
REQUIRES mbedtls lwip
|
|
PRIV_REQUIRES http_parser)
|
|
|
|
if(CONFIG_ESP_TLS_USING_WOLFSSL)
|
|
idf_component_get_property(wolfssl esp-wolfssl COMPONENT_LIB)
|
|
target_link_libraries(${COMPONENT_LIB} PUBLIC ${wolfssl})
|
|
endif()
|
|
|
|
# Increase link multiplicity to get some lwip symbols correctly resolved by the linker
|
|
# due to cyclic dependencies present in IDF for lwip/esp_netif/mbedtls
|
|
idf_component_get_property(lwip lwip COMPONENT_LIB)
|
|
set_property(TARGET ${lwip} APPEND PROPERTY LINK_INTERFACE_MULTIPLICITY 5)
|