mirror of https://github.com/hak5/openwrt.git
Revert "tools/cmake: Update to 3.14.0"
The cmake bump to 3.14.0 breaks build on all targets. Revert it for now.
This reverts commit a3446257a8
.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
openwrt-19.07
parent
a56c21f582
commit
d454035430
|
@ -7,13 +7,13 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=cmake
|
||||
PKG_VERSION:=3.14.0
|
||||
PKG_VERSION:=3.13.2
|
||||
PKG_CPE_ID:=cpe:/a:kitware:cmake
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://cmake.org/files/v3.14/ \
|
||||
https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/
|
||||
PKG_HASH:=aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502
|
||||
PKG_SOURCE_URL:=https://cmake.org/files/v3.13/ \
|
||||
https://fossies.org/linux/misc/
|
||||
PKG_HASH:=c925e7d2c5ba511a69f43543ed7b4182a7d446c274c7480d0e42cd933076ae25
|
||||
|
||||
HOST_BUILD_PARALLEL:=1
|
||||
HOST_CONFIGURE_PARALLEL:=1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Tests/RunCMake/CMakeLists.txt
|
||||
+++ b/Tests/RunCMake/CMakeLists.txt
|
||||
@@ -325,15 +325,6 @@ add_RunCMake_test(no_install_prefix)
|
||||
@@ -301,15 +301,6 @@ add_RunCMake_test(no_install_prefix)
|
||||
add_RunCMake_test(configure_file)
|
||||
add_RunCMake_test(CTestTimeoutAfterMatch)
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
add_RunCMake_test(FindPkgConfig)
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -483,13 +483,6 @@ if(BUILD_TESTING)
|
||||
@@ -437,13 +437,6 @@ if(BUILD_TESTING)
|
||||
|
||||
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
|
|||
---
|
||||
--- a/Utilities/cmcurl/CMakeLists.txt
|
||||
+++ b/Utilities/cmcurl/CMakeLists.txt
|
||||
@@ -453,6 +453,14 @@ if(CMAKE_USE_OPENSSL)
|
||||
@@ -454,6 +454,14 @@ if(CMAKE_USE_OPENSSL)
|
||||
set(USE_OPENSSL ON)
|
||||
set(HAVE_LIBCRYPTO ON)
|
||||
set(HAVE_LIBSSL ON)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -1168,7 +1168,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
||||
@@ -1164,7 +1164,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
||||
' > "test.c"
|
||||
cmake_original_make_flags="${cmake_make_flags}"
|
||||
if [ "x${cmake_parallel_make}" != "x" ]; then
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
From 4ca5a815f2dfe9e1116cc2ccd5ddb56d0d00d12e Mon Sep 17 00:00:00 2001
|
||||
From: Brad King <brad.king@kitware.com>
|
||||
Date: Thu, 7 Mar 2019 14:55:54 -0500
|
||||
Subject: [PATCH] C++ feature checks: Match warnings more strictly
|
||||
|
||||
Require the word "warning" to appear at the start of a line, after
|
||||
whitespace, or after a `:`. This is the same that CTest launchers use
|
||||
to match warnings. It avoids matching "warning" inside file paths.
|
||||
|
||||
Fixes: #19019
|
||||
---
|
||||
Source/Checks/cm_cxx_features.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/Source/Checks/cm_cxx_features.cmake
|
||||
+++ b/Source/Checks/cm_cxx_features.cmake
|
||||
@@ -25,7 +25,7 @@ function(cm_check_cxx_feature name)
|
||||
# Filter out xcodebuild warnings.
|
||||
string(REGEX REPLACE "[^\n]* xcodebuild\\[[0-9]*:[0-9]*\\] warning: [^\n]*" "" check_output "${check_output}")
|
||||
# If using the feature causes warnings, treat it as broken/unavailable.
|
||||
- if(check_output MATCHES "[Ww]arning")
|
||||
+ if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
|
||||
set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
|
||||
endif()
|
||||
if(CMake_HAVE_CXX_${FEATURE})
|
Loading…
Reference in New Issue