mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -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.
60 lines
1.9 KiB
CMake
60 lines
1.9 KiB
CMake
if(BOOTLOADER_BUILD)
|
|
# Bootloader builds need the platform_include directory (for assert.h), but nothing else
|
|
idf_component_register(INCLUDE_DIRS platform_include)
|
|
return()
|
|
endif()
|
|
|
|
set(srcs
|
|
"abort.c"
|
|
"assert.c"
|
|
"heap.c"
|
|
"locks.c"
|
|
"poll.c"
|
|
"pthread.c"
|
|
"random.c"
|
|
"reent_init.c"
|
|
"newlib_init.c"
|
|
"syscalls.c"
|
|
"termios.c"
|
|
"stdatomic.c"
|
|
"time.c"
|
|
"sysconf.c"
|
|
"realpath.c")
|
|
set(include_dirs platform_include)
|
|
|
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND)
|
|
set(ldfragments "esp32-spiram-rom-functions-c.lf")
|
|
endif()
|
|
|
|
list(APPEND ldfragments "newlib.lf" "system_libs.lf")
|
|
|
|
idf_component_register(SRCS "${srcs}"
|
|
INCLUDE_DIRS "${include_dirs}"
|
|
PRIV_INCLUDE_DIRS priv_include
|
|
PRIV_REQUIRES soc spi_flash
|
|
LDFRAGMENTS "${ldfragments}")
|
|
|
|
# Toolchain libraries require code defined in this component
|
|
idf_component_get_property(newlib newlib COMPONENT_LIB)
|
|
target_link_libraries(${COMPONENT_LIB} INTERFACE c m gcc "$<TARGET_FILE:${newlib}>")
|
|
|
|
set_source_files_properties(heap.c PROPERTIES COMPILE_FLAGS -fno-builtin)
|
|
|
|
# Forces the linker to include heap, syscall, pthread, assert, and retargetable locks from this component,
|
|
# instead of the implementations provided by newlib.
|
|
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_heap_impl")
|
|
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_syscalls_impl")
|
|
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_pthread_impl")
|
|
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_assert_impl")
|
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "${EXTRA_LINK_FLAGS}")
|
|
|
|
if(CONFIG_NEWLIB_NANO_FORMAT)
|
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "--specs=nano.specs")
|
|
endif()
|
|
|
|
add_subdirectory(port)
|
|
|
|
# if lwip is included in the build, add it as a public requirement so that
|
|
# #include <sys/socket.h> works without any special provisions.
|
|
idf_component_optional_requires(PUBLIC lwip)
|