diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-05 13:22:42 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-05 13:45:55 +0100 |
| commit | 8160beb014baf55cd917cec50c416b69519c6a4d (patch) | |
| tree | 464278c1645d3491a7aa1f2c5b401015fd8d9be3 /tools/cmake/patches/130-libarchive-fix-libressl-compat.patch | |
| parent | d2ddda691eeac92c6854658fb7389b7f9485d6c8 (diff) | |
| download | upstream-8160beb014baf55cd917cec50c416b69519c6a4d.tar.gz upstream-8160beb014baf55cd917cec50c416b69519c6a4d.tar.bz2 upstream-8160beb014baf55cd917cec50c416b69519c6a4d.zip | |
cmake: update to version 3.7.1
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'tools/cmake/patches/130-libarchive-fix-libressl-compat.patch')
| -rw-r--r-- | tools/cmake/patches/130-libarchive-fix-libressl-compat.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tools/cmake/patches/130-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/130-libarchive-fix-libressl-compat.patch new file mode 100644 index 0000000000..a56ac2ed0c --- /dev/null +++ b/tools/cmake/patches/130-libarchive-fix-libressl-compat.patch @@ -0,0 +1,22 @@ +--- 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) +--- 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) |