]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
cmake: Update to 3.0.2
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Dec 2014 00:42:31 +0000 (01:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Dec 2014 00:42:56 +0000 (01:42 +0100)
cmake/cmake.nm
cmake/patches/cmake-strict_aliasing.patch [new file with mode: 0644]

index 1227af7a6717e16b978312fe4543bbc60a995eda..c2e139c7734bab61ed1064cc446449bcb07fc4cf 100644 (file)
@@ -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 (file)
index 0000000..2bc1555
--- /dev/null
@@ -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