cmake: Update to 3.25.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/cmake/cmake.macro b/cmake/cmake.macro
deleted file mode 100644 (file)
index f37e5ef..0000000
--- a/cmake/cmake.macro
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# cmake macros
-#
-
-__cmake = /usr/bin/cmake
-if "%{lib}" == "lib64"
-       __cmake_lib_suffix = -DLIB_SUFFIX=64
-end
-
-cmake = %{__cmake} \
-       -DCMAKE_VERBOSE_MAKEFILE=ON \
-       -DCMAKE_INSTALL_PREFIX:PATH=%{prefix} \
-       -DINCLUDE_INSTALL_DIR:PATH=%{includedir} \
-       -DLIB_INSTALL_DIR:PATH=%{libdir} \
-       -DSYSCONF_INSTALL_DIR:PATH=%{sysconfdir} \
-       -DSHARE_INSTALL_PREFIX:PATH=%{datadir} \
-       %{__cmake_lib_suffix} \
-       -DBUILD_SHARED_LIBS:BOOL=ON

diff --git a/cmake/cmake.nm b/cmake/cmake.nm
index ee8e910152f17df5e57104ceb90ee03d85bb90ae..4cd8471bb3cb857ab1ab6202f0dcd98dac490ad7 100644 (file)
--- a/cmake/cmake.nm
+++ b/cmake/cmake.nm
@@ -5,12 +5,12 @@
 
 name       = cmake
 version    = %{ver_maj}.%{ver_min}
-ver_maj    = 3.14
-ver_min    = 5
+ver_maj    = 3.25
+ver_min    = 0
 release    = 1
 
 groups     = Development/Tools
-url        = http://www.cmake.org
+url        = https://www.cmake.org
 license    = BSD
 summary    = Cross-platform make system.
 
@@ -23,7 +23,7 @@ description
        generation, code generation, and template instantiation.
 end
 
-source_dl  = http://www.cmake.org/files/v%{ver_maj}/
+source_dl  = https://www.cmake.org/files/v%{ver_maj}/
 
 build
        requires
@@ -41,8 +41,6 @@ build
                zlib-devel
        end
 
-       PARALLELISMFLAGS = -j4
-
        build
                mkdir -pv build
                cd build && ../bootstrap \
@@ -65,11 +63,6 @@ build
 
        install
                cd build && make install DESTDIR=%{BUILDROOT}
-
-               # Install pakfire macro.
-               mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros
-               install -v -m 644 %{DIR_SOURCE}/cmake.macro \
-                       %{BUILDROOT}/usr/lib/pakfire/macros
        end
 end
 

diff --git a/cmake/patches/cmake-strict_aliasing.patch b/cmake/patches/cmake-strict_aliasing.patch
deleted file mode 100644 (file)
index 2bc1555..0000000
--- a/cmake/patches/cmake-strict_aliasing.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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