cmake: Compatibility fixes from Mahavir

diff --git a/components/nghttp/CMakeLists.txt b/components/nghttp/CMakeLists.txt
index bf3f72746888ca46b12ffbe2c5cc2e9b6c5530de..c7e4b754b87f7f89795a9868e6e10c51fb4884f4 100644 (file)
--- a/components/nghttp/CMakeLists.txt
+++ b/components/nghttp/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(COMPONENT_ADD_INCLUDEDIRS port/include nghttp2/lib/includes)
 set(COMPONENT_SRCDIRS nghttp2/lib port)
 
-set(COMPONENT_REQUIRES lwip mbedtls)
-
 register_component()

diff --git a/components/pthread/CMakeLists.txt b/components/pthread/CMakeLists.txt
index ad162fe1e1c2529624178672769534783d694e44..0b93e09ed49b09b38d934929d12d6bd60c679c3d 100644 (file)
--- a/components/pthread/CMakeLists.txt
+++ b/components/pthread/CMakeLists.txt
@@ -2,3 +2,7 @@ set(COMPONENT_SRCDIRS ".")
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 set(COMPONENT_REQUIRES)
 register_component()
+
+if(CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK)
+    target_link_libraries(pthread "-Wl,--wrap=vPortCleanUpTCB")
+endif()

diff --git a/components/wpa_supplicant/CMakeLists.txt b/components/wpa_supplicant/CMakeLists.txt
index d349e96be6c8e055ccefc591c557cb908108a1f6..e77e3160b42a038e76cede651b9aeaeb25f52cd9 100644 (file)
--- a/components/wpa_supplicant/CMakeLists.txt
+++ b/components/wpa_supplicant/CMakeLists.txt
@@ -2,7 +2,7 @@ set(COMPONENT_SRCDIRS src/crypto port src/fast_crypto)
 set(COMPONENT_ADD_INCLUDEDIRS include port/include)
 
 set(COMPONENT_REQUIRES "")
-set(COMPONENT_PRIV_REQUIRES lwip mbedtls)
+set(COMPONENT_PRIV_REQUIRES mbedtls)
 
 register_component()