diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2018-10-06 12:37:22 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-10-07 02:10:15 +0200 |
| commit | f6159c1e37429b6505094cfd4b6c09f4634fea38 (patch) | |
| tree | 6445f597e01597508fbdab4a77bbd4492a8c09ca /tools/cmake | |
| parent | 9efd0cb403f68bd728a40e069a7d04b623f469e6 (diff) | |
| download | upstream-f6159c1e37429b6505094cfd4b6c09f4634fea38.tar.gz upstream-f6159c1e37429b6505094cfd4b6c09f4634fea38.tar.bz2 upstream-f6159c1e37429b6505094cfd4b6c09f4634fea38.zip | |
tools/cmake: Update to 3.12.3
Update CMake to 3.12.3
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake')
| -rw-r--r-- | tools/cmake/Makefile | 4 | ||||
| -rw-r--r-- | tools/cmake/patches/140-libarchive-fix-libressl.patch | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index a209fe3a81..9da08c468d 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.12.2 +PKG_VERSION:=3.12.3 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cmake.org/files/v3.12/ \ https://fossies.org/linux/misc/ -PKG_HASH:=0f97485799e51a7070cc11494f3e02349b0fc3a24cc12b082e737bf67a0581a4 +PKG_HASH:=acbf13af31a741794106b76e5d22448b004a66485fc99f6d7df4d22e99da164a HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 diff --git a/tools/cmake/patches/140-libarchive-fix-libressl.patch b/tools/cmake/patches/140-libarchive-fix-libressl.patch index ad8a0969a8..ddddc5e836 100644 --- a/tools/cmake/patches/140-libarchive-fix-libressl.patch +++ b/tools/cmake/patches/140-libarchive-fix-libressl.patch @@ -11,18 +11,6 @@ Signed-off-by: Bernard Spil <brnrd@FreeBSD.org> libarchive/archive_openssl_hmac_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h -+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h -@@ -28,7 +28,8 @@ - #include <openssl/hmac.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include <stdlib.h> /* malloc, free */ - #include <string.h> /* memset */ - static inline HMAC_CTX *HMAC_CTX_new(void) --- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h @@ -28,7 +28,8 @@ |