aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-04-05 15:38:32 -0700
committerHans Dedecker <dedeckeh@gmail.com>2020-04-06 20:30:18 +0200
commit8af80e79bd5b750bf9a5ab01a6ecdb3971248bae (patch)
treeef68eb881b3fd334cc3653df3bf5fc621600ebf8 /tools/cmake/patches/110-libarchive-fix-libressl-compat.patch
parenta0d14510884e6549a1637f69b0bb7325b280aff8 (diff)
downloadupstream-8af80e79bd5b750bf9a5ab01a6ecdb3971248bae.tar.gz
upstream-8af80e79bd5b750bf9a5ab01a6ecdb3971248bae.tar.bz2
upstream-8af80e79bd5b750bf9a5ab01a6ecdb3971248bae.zip
tools/cmake: update to 3.17.0
Remove libressl patches; they are no longer needed as LibreSSl adde support Replace qt tests patch with one that disables all of them. Refresh remaining one. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'tools/cmake/patches/110-libarchive-fix-libressl-compat.patch')
-rw-r--r--tools/cmake/patches/110-libarchive-fix-libressl-compat.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch
deleted file mode 100644
index ba6565b6af..0000000000
--- a/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
-+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
-@@ -28,7 +28,7 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)