From: Angus Gratton <angus@espressif.com>
Date: Wed, 6 Jun 2018 06:14:03 +0000 (+1000)
Subject: cmake: Compatibility fixes from Mahavir
X-Git-Tag: v3.1-rc2~9^2~17^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4667fb2495929465238d47060a7247f7996e76cb;p=esp-idf

cmake: Compatibility fixes from Mahavir
---

diff --git a/components/nghttp/CMakeLists.txt b/components/nghttp/CMakeLists.txt
index bf3f727468..c7e4b754b8 100644
--- 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 ad162fe1e1..0b93e09ed4 100644
--- 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 d349e96be6..e77e3160b4 100644
--- 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()