From eef7f9ea37366c93039b386ca8e438b26a199214 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 Sep 2021 19:32:36 -0700 Subject: tools/cmake: update to 3.21.2 Refreshed patches. Signed-off-by: Rosen Penev --- tools/cmake/patches/120-curl-fix-libressl-linking.patch | 2 +- tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/cmake/patches') diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch b/tools/cmake/patches/120-curl-fix-libressl-linking.patch index 1095a4f8ac..97ef5ceb00 100644 --- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch +++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch @@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich --- --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -508,6 +508,14 @@ if(CMAKE_USE_OPENSSL) +@@ -528,6 +528,14 @@ if(CMAKE_USE_OPENSSL) endif() set(SSL_ENABLED ON) set(USE_OPENSSL ON) diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index 512765c5af..3822cba166 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -1,6 +1,6 @@ --- a/bootstrap +++ b/bootstrap -@@ -1397,7 +1397,10 @@ int main(){ printf("1%c", (char)0x0a); r +@@ -1420,7 +1420,10 @@ int main(){ printf("1%c", (char)0x0a); r ' > "test.c" cmake_original_make_flags="${cmake_make_flags}" if test "x${cmake_parallel_make}" != "x"; then -- cgit v1.2.3