domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/cmake: update to 3.8.1

Browse Source 
* update cmake to 3.8.1
* refresh patches

Release notes:
https://cmake.org/cmake/help/v3.8/release/3.8.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman
2017-05-08 22:18:25 +03:00
committed by Felix Fietkau
parent 910df3f06c
commit 1a0d52a733
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cmake/Makefile
View File

@@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cmake PKG_NAME:=cmake
PKG_VERSION:=3.7.2 PKG_VERSION:=3.8.1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cmake.org/files/v3.7/ \ PKG_SOURCE_URL:=https://cmake.org/files/v3.8/ \
https://fossies.org/linux/misc/ https://fossies.org/linux/misc/
PKG_HASH:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 PKG_HASH:=ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1

4
tools/cmake/patches/100-disable_qt_tests.patch
View File

@@ -1,6 +1,6 @@
--- a/Tests/RunCMake/CMakeLists.txt --- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt
@@ -225,15 +225,6 @@ add_RunCMake_test(no_install_prefix) @@ -244,15 +244,6 @@ add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file) add_RunCMake_test(configure_file)
add_RunCMake_test(CTestTimeoutAfterMatch) add_RunCMake_test(CTestTimeoutAfterMatch)
@@ -18,7 +18,7 @@
add_RunCMake_test(FindPkgConfig) add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt --- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt
@@ -393,10 +393,6 @@ if(BUILD_TESTING) @@ -398,10 +398,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})

4
tools/cmake/patches/110-freebsd-compat.patch
View File

@@ -21,8 +21,8 @@ Change-Id: I3b91ed7ac0e6878035aee202b3336c536cc6d2ff
--- a/Source/kwsys/SystemInformation.cxx --- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx
@@ -89,6 +89,15 @@ typedef int siginfo_t; @@ -82,6 +82,15 @@ typedef int siginfo_t;
# include <ifaddrs.h> #include <net/if.h>
#define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN #define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
#endif #endif
+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) +# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)

2
tools/cmake/patches/140-curl-fix-libressl-linking.patch
View File

@@ -19,7 +19,7 @@ and unconditionally link the rt library when the symbol is found.
Signed-off-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
--- a/Utilities/cmcurl/CMakeLists.txt --- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt
@@ -362,6 +362,10 @@ set(HAVE_LIBSSL OFF) @@ -374,6 +374,10 @@ set(HAVE_LIBSSL OFF)
if(CMAKE_USE_OPENSSL) if(CMAKE_USE_OPENSSL)
find_package(OpenSSL) find_package(OpenSSL)
if(OPENSSL_FOUND) if(OPENSSL_FOUND)

2
tools/cmake/patches/150-bootstrap_parallel_make_flag.patch
View File

@@ -1,6 +1,6 @@
--- a/bootstrap --- a/bootstrap
+++ b/bootstrap +++ b/bootstrap
@@ -958,7 +958,10 @@ int main(){ printf("1%c", (char)0x0a); r @@ -1046,7 +1046,10 @@ int main(){ printf("1%c", (char)0x0a); r
' > "test.c" ' > "test.c"
cmake_original_make_flags="${cmake_make_flags}" cmake_original_make_flags="${cmake_make_flags}"
if [ "x${cmake_parallel_make}" != "x" ]; then if [ "x${cmake_parallel_make}" != "x" ]; then