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

tools/cmake: update to 3.3.2

Browse Source 
Update cmake to 3.3.2 and refresh patches.
Add a secondary download location.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 47327
This commit is contained in:
Felix Fietkau
2015-10-31 09:31:06 +00:00
parent faabe8e8e6
commit 35cc181eb2
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/cmake/Makefile
View File

@@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2014 OpenWrt.org # Copyright (C) 2006-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -7,11 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cmake PKG_NAME:=cmake
PKG_VERSION:=2.8.12.2 PKG_VERSION:=3.3.2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.cmake.org/files/v2.8/ PKG_SOURCE_URL:=http://www.cmake.org/files/v3.3/ \
PKG_MD5SUM:=17c6513483d23590cbce6957ec6d1e66 https://fossies.org/linux/misc/
PKG_MD5SUM:=5febbd11bcaac854a27eebaf4a124be2
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1

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

@@ -1,8 +1,8 @@
--- a/Tests/RunCMake/CMakeLists.txt --- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt
@@ -101,16 +101,6 @@ @@ -160,15 +160,6 @@
add_RunCMake_test(TargetPolicies) add_RunCMake_test(no_install_prefix)
add_RunCMake_test(alias_targets) add_RunCMake_test(configure_file)
-find_package(Qt4 QUIET) -find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET) -find_package(Qt5Core QUIET)
@@ -10,21 +10,20 @@
- add_RunCMake_test(IncompatibleQt) - add_RunCMake_test(IncompatibleQt)
-endif() -endif()
-if (QT4_FOUND) -if (QT4_FOUND)
- set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}) - add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
- add_RunCMake_test(ObsoleteQtMacros)
-endif() -endif()
- -
if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]") find_package(PkgConfig QUIET)
add_RunCMake_test(include_external_msproject) if(PKG_CONFIG_FOUND)
add_RunCMake_test(SolutionGlobalSections) add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt --- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt
@@ -262,10 +262,6 @@ @@ -358,10 +358,6 @@
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
- if(NOT QT4_FOUND) - if(NOT QT4_FOUND)
- find_package(Qt4) - find_package(Qt4 QUIET)
- endif() - endif()
- -
if(QT4_FOUND) if(QT4_FOUND)

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

@@ -23,7 +23,7 @@ diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation
index 7c31f3a..2672730 100644 index 7c31f3a..2672730 100644
--- a/Source/kwsys/SystemInformation.cxx --- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx
@@ -88,6 +88,15 @@ typedef int siginfo_t; @@ -91,6 +91,15 @@ typedef int siginfo_t;
# include <ifaddrs.h> # include <ifaddrs.h>
# define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
# endif # endif
@@ -39,6 +39,4 @@ index 7c31f3a..2672730 100644
#endif #endif
#if defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__OpenBSD__) || defined(__NetBSD__)
--
1.7.10.4