From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Dec 2014 00:42:31 +0000 (+0100)
Subject: cmake: Update to 3.0.2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=166a2650a1dfe3d3a7bddd1eccbfee95cd2473ce;p=ipfire-3.x.git

cmake: Update to 3.0.2
---

diff --git a/cmake/cmake.nm b/cmake/cmake.nm
index 1227af7a6..c2e139c77 100644
--- a/cmake/cmake.nm
+++ b/cmake/cmake.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = cmake
-version    = 2.8.4
-release    = 3
+version    = 3.0.2
+release    = 1
 
 groups     = Development/Tools
 url        = http://www.cmake.org
@@ -25,6 +25,8 @@ description
 	generation, code generation, and template instantiation.
 end
 
+source_dl  = http://www.cmake.org/files/v3.0/
+
 build
 	requires
 		expat-devel
diff --git a/cmake/patches/cmake-strict_aliasing.patch b/cmake/patches/cmake-strict_aliasing.patch
new file mode 100644
index 000000000..2bc155589
--- /dev/null
+++ b/cmake/patches/cmake-strict_aliasing.patch
@@ -0,0 +1,19 @@
+diff -up cmake-2.8.11/Source/CMakeLists.txt\~ cmake-2.8.11/Source/CMakeLists.txt
+--- cmake-2.8.11/Source/CMakeLists.txt~	2013-05-15 19:38:13.000000000 +0200
++++ cmake-2.8.11/Source/CMakeLists.txt	2013-07-25 16:35:01.200389140 +0200
+@@ -308,6 +308,13 @@ if(APPLE)
+     cmLocalXCodeGenerator.h)
+ endif()
+ 
++# GCC shows strict aliasing warnings with cm_sha2.c.  Turn off the
++# corresponding optimizations.
++if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
++  set_source_files_properties(cm_sha2.c PROPERTIES
++			      COMPILE_FLAGS "-fno-strict-aliasing")
++endif()
++
+ 
+ if (WIN32)
+   set(SRCS ${SRCS}
+
+Diff finished.  Thu Jul 25 16:35:18 2013