KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools/cmake: Update to 3.12.3

Browse source 
Update CMake to 3.12.3

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
This commit is contained in:
Daniel Engberg 2018-10-06 12:37:22 +02:00 committed by Hauke Mehrtens
parent 9efd0cb403
commit f6159c1e37
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cmake/Makefile
View file

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cmake PKG_NAME:=cmake
PKG_VERSION:=3.12.2 PKG_VERSION:=3.12.3
PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_CPE_ID:=cpe:/a:kitware:cmake
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cmake.org/files/v3.12/ \ PKG_SOURCE_URL:=https://cmake.org/files/v3.12/ \
https://fossies.org/linux/misc/ https://fossies.org/linux/misc/
PKG_HASH:=0f97485799e51a7070cc11494f3e02349b0fc3a24cc12b082e737bf67a0581a4 PKG_HASH:=acbf13af31a741794106b76e5d22448b004a66485fc99f6d7df4d22e99da164a
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1

12
tools/cmake/patches/140-libarchive-fix-libressl.patch
View file

@ -11,18 +11,6 @@ Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
libarchive/archive_openssl_hmac_private.h | 3 ++- libarchive/archive_openssl_hmac_private.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 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 --- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
@@ -28,7 +28,8 @@ @@ -28,7 +28,8 @@