aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-01-05 23:30:02 +0200
committerJohn Crispin <john@phrozen.org>2018-01-17 08:52:54 +0100
commit3c4df661c0c8d693b5198cbbf61f679c76fdea52 (patch)
tree10256cd94536ec270ff2a075cba0cee54ef1728a /tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
parentb0d513ec91d76cc6b208094d0f78e54f252de573 (diff)
downloadupstream-3c4df661c0c8d693b5198cbbf61f679c76fdea52.tar.gz
upstream-3c4df661c0c8d693b5198cbbf61f679c76fdea52.tar.bz2
upstream-3c4df661c0c8d693b5198cbbf61f679c76fdea52.zip
tools/cmake: update to 3.10.1
Update cmake to 3.10.1 Refresh patches Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'tools/cmake/patches/120-libarchive-fix-libressl-compat.patch')
-rw-r--r--tools/cmake/patches/120-libarchive-fix-libressl-compat.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
index a56ac2ed0c..ba6565b6af 100644
--- a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
+++ b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
@@ -9,14 +9,3 @@
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
---- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
-+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
-@@ -28,7 +28,7 @@
- #include <openssl/hmac.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 HMAC_CTX *HMAC_CTX_new(void)