[vlc-devel] [3.0 PATCH v2 09/20] tools: cmake: fix building CURL in older OS X

[Steve Lhomme]

Avoid this issue in the built-in CURL:

Undefined symbols for architecture x86_64:
  "_SSLCopyALPNProtocols", referenced from:
      _sectransp_connect_step2 in libcmcurl.a(sectransp.c.o)
  "_SSLSetALPNProtocols", referenced from:
      _sectransp_connect_common in libcmcurl.a(sectransp.c.o)
ld: symbol(s) not found for architecture x86_64
---
 extras/tools/cmake-oldmac.patch | 20 ++++++++++++++++++++
 extras/tools/tools.mak          |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 extras/tools/cmake-oldmac.patch

diff --git a/extras/tools/cmake-oldmac.patch b/extras/tools/cmake-oldmac.patch
new file mode 100644
index 00000000000..231a9051586
--- /dev/null
+++ b/extras/tools/cmake-oldmac.patch
@@ -0,0 +1,20 @@
+--- cmake/Utilities/cmcurl/lib/vtls/sectransp.c.oldmac	2020-03-20 11:26:14.000000000 +0100
++++ cmake/Utilities/cmcurl/lib/vtls/sectransp.c	2020-04-01 09:41:13.005951700 +0200
+@@ -1576,7 +1576,7 @@ static CURLcode sectransp_connect_step1(
+   }
+ #endif /* CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS */
+ 
+-#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
++#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1 && 0
+   if(conn->bits.tls_enable_alpn) {
+     if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
+       CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0,
+@@ -2626,7 +2626,7 @@ sectransp_connect_step2(struct connectda
+         break;
+     }
+ 
+-#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
++#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1 && 0
+     if(conn->bits.tls_enable_alpn) {
+       if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
+         CFArrayRef alpnArr = NULL;
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 56b22ffae77..1a506cdcaaa 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -84,6 +84,7 @@ cmake-$(CMAKE_VERSION).tar.gz:
 
 cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(UNPACK)
+	$(APPLY) cmake-oldmac.patch
 	$(MOVE)
 
 .cmake: cmake
-- 
2.17.1