From c3d3c6ab943a8d03115099835092b434ba8f6a10 Mon Sep 17 00:00:00 2001
From: Sacha Verweij <sacha.verweij@alumni.stanford.edu>
Date: Mon, 21 Dec 2020 18:36:42 -0500
Subject: [PATCH] Carry MBedTLS patch that works around CMake 3.18.2 bug.
 (#38933)

MBedTLS fails to build with CMake 3.18.2, due to a bug in
CMake 3.18.2 causing failure to find python3. For more information,
please see https://github.com/ARMmbed/mbedtls/issues/3690 and
https://gitlab.kitware.com/cmake/cmake/-/issues/21204.

This pull request applies the MBedTLS patch that works around this
issue from https://github.com/ARMmbed/mbedtls/pull/3691, which
has been merged into MBedTLS's development branch but not
yet into a tagged release. The latest minor release as of that
merge was 2.25.0, so it's probably safe to conjecture that this
patch will be live as of minor release 2.26.0; it's also
possible that this patch will land on patch releases for
2.24.0 and 2.25.0, but this author doesn't know.
---
 deps/mbedtls.mk                         | 11 +++++++++++
 deps/patches/mbedtls-cmake-findpy.patch | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 deps/patches/mbedtls-cmake-findpy.patch

diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk
index 03c4404786783..494771466ad00 100644
--- a/deps/mbedtls.mk
+++ b/deps/mbedtls.mk
@@ -31,6 +31,17 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/source-extracted: $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz
 checksum-mbedtls: $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz
 	$(JLCHECKSUM) $<
 
+$(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied: $(SRCCACHE)/$(MBEDTLS_SRC)/source-extracted
+	# Apply workaround for CMake 3.18.2 bug (https://github.com/ARMmbed/mbedtls/pull/3691).
+	# This patch merged upstream shortly after MBedTLS's 2.25.0 minor release, so chances
+	# are it will be included at least in their next minor release (2.26.0?).
+	cd $(SRCCACHE)/$(MBEDTLS_SRC) && \
+		patch -p1 -f < $(SRCDIR)/patches/mbedtls-cmake-findpy.patch
+	echo 1 > @$
+
+$(BUILDDIR)/$(MBEDTLS_SRC)/build-configured: \
+	$(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied
+
 $(BUILDDIR)/$(MBEDTLS_SRC)/build-configured: $(SRCCACHE)/$(MBEDTLS_SRC)/source-extracted
 	mkdir -p $(dir $@)
 	cd $(dir $@) && \
diff --git a/deps/patches/mbedtls-cmake-findpy.patch b/deps/patches/mbedtls-cmake-findpy.patch
new file mode 100644
index 0000000000000..0b66a8b2ac1d7
--- /dev/null
+++ b/deps/patches/mbedtls-cmake-findpy.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8833246..2ed55ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,18 @@
+ #
+
+ cmake_minimum_required(VERSION 2.6)
++
++# https://cmake.org/cmake/help/latest/policy/CMP0011.html
++# Setting this policy is required in CMake >= 3.18.0, otherwise a warning is generated. The OLD
++# policy setting is deprecated, and will be removed in future versions.
++cmake_policy(SET CMP0011 NEW)
++# https://cmake.org/cmake/help/latest/policy/CMP0012.html
++# Setting the CMP0012 policy to NEW is required for FindPython3 to work with CMake 3.18.2
++# (there is a bug in this particular version), otherwise, setting the CMP0012 policy is required
++# for CMake versions >= 3.18.3 otherwise a deprecated warning is generated. The OLD policy setting
++# is deprecated and will be removed in future versions.
++cmake_policy(SET CMP0012 NEW)
++
+ if(TEST_CPP)
+  project("mbed TLS" C CXX)
+ else()