From a8c315192b750453e1b821ab735bdabca43a4d0e Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Wed, 4 Apr 2018 10:02:32 +0200 Subject: tools/cmake: Update to 3.11.0 Update cmake to 3.11.0 Remove 110-alpine_musl-compat.patch as it's integrated upstream Rename and refresh patches Signed-off-by: Daniel Engberg --- tools/cmake/patches/110-libarchive-fix-libressl-compat.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tools/cmake/patches/110-libarchive-fix-libressl-compat.patch (limited to 'tools/cmake/patches/110-libarchive-fix-libressl-compat.patch') diff --git a/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch new file mode 100644 index 0000000000..ba6565b6af --- /dev/null +++ b/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch @@ -0,0 +1,11 @@ +--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h ++++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h +@@ -28,7 +28,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include /* malloc, free */ + #include /* memset */ + static inline EVP_MD_CTX *EVP_MD_CTX_new(void) -- cgit v1.2.3