Compare commits
69 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
7cf46b9e77 | ||
|
08e6d37afb | ||
|
c18e747be3 | ||
|
c87b6228ec | ||
|
449b8c6bb1 | ||
|
3249491fb3 | ||
|
a299111fe1 | ||
|
b707c6805c | ||
|
e4e979aedd | ||
|
2b6e5b1d85 | ||
|
41dff1ec88 | ||
|
a451774852 | ||
|
8ae403196d | ||
|
4663bf397a | ||
|
c106851f54 | ||
|
1ddd4423ba | ||
|
d15cbd20ce | ||
|
7e2cfc8785 | ||
|
baa8129dbb | ||
|
4da2a4b8c1 | ||
|
c8720654f4 | ||
|
12df3dd3f7 | ||
|
3909660989 | ||
|
38dd024421 | ||
|
2c104d87da | ||
|
e2ea5cd999 | ||
|
c10f3133b9 | ||
|
43d177fa45 | ||
|
887221a3da | ||
|
ad120f2a4c | ||
|
6bbf683451 | ||
|
47534abef0 | ||
|
8ad8eb9214 | ||
|
ff8467c934 | ||
|
7e4503e30d | ||
|
ff5639876b | ||
|
53b926554c | ||
|
090b4a0767 | ||
|
aec38b0832 | ||
|
6b692336ec | ||
|
f5b116c2a5 | ||
|
d2c731e954 | ||
|
c6ce53bc36 | ||
|
ed5ec6c0ce | ||
|
52aebae41c | ||
|
4426da220f | ||
|
c1d581dd94 | ||
|
1d2c31f13f | ||
|
e096c7c3fd | ||
|
982fc376fe | ||
|
b5ab411014 | ||
|
4bee260a33 | ||
|
e2873452a2 | ||
|
cc03ad334f | ||
|
f52c15acca | ||
|
58d72bbcee | ||
|
759f15949a | ||
|
c50f9727e8 | ||
|
ec77e26a43 | ||
|
63c436655e | ||
|
77583d3966 | ||
|
90c00fbf34 | ||
|
27354e45c1 | ||
|
3284292dcd | ||
|
87a1114ba4 | ||
|
c99e94ccd3 | ||
|
a6595cacfa | ||
|
a3fc67c060 | ||
|
61280587ec |
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
25
5383.patch
25
5383.patch
@ -1,25 +0,0 @@
|
||||
From 23cd98a66a3eca1cc8e89a77f4fdf406c4f4c113 Mon Sep 17 00:00:00 2001
|
||||
From: Marc Chevrier <marc.chevrier@gmail.com>
|
||||
Date: Fri, 16 Oct 2020 11:36:53 +0200
|
||||
Subject: [PATCH] FindPython: Add support of version 3.10
|
||||
|
||||
---
|
||||
Modules/FindPython/Support.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
|
||||
index 7de2d29946..2b911ae7e3 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
|
||||
message (FATAL_ERROR "FindPython: INTERNAL ERROR")
|
||||
endif()
|
||||
if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
|
||||
- set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
|
||||
set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
else()
|
||||
--
|
||||
GitLab
|
||||
|
42
5482.patch
42
5482.patch
@ -1,42 +0,0 @@
|
||||
From bb2ebbf2412ef9343f50a45868459ffb95fa9081 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||
Date: Mon, 9 Nov 2020 17:35:13 +0100
|
||||
Subject: [PATCH] FindPython{Interp,Libs}: Add support for version 3.10
|
||||
|
||||
Extend the change from commit 23cd98a66a (FindPython: Add support of
|
||||
version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy
|
||||
`FindPython{Interp,Libs}` modules too.
|
||||
---
|
||||
Modules/FindPythonInterp.cmake | 2 +-
|
||||
Modules/FindPythonLibs.cmake | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
|
||||
index 1e01a99cbe..efe0f11901 100644
|
||||
--- a/Modules/FindPythonInterp.cmake
|
||||
+++ b/Modules/FindPythonInterp.cmake
|
||||
@@ -54,7 +54,7 @@ unset(_Python_NAMES)
|
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(PythonInterp_FIND_VERSION)
|
||||
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
|
||||
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
|
||||
index d3ec7beec6..396f0d2ed4 100644
|
||||
--- a/Modules/FindPythonLibs.cmake
|
||||
+++ b/Modules/FindPythonLibs.cmake
|
||||
@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
|
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(PythonLibs_FIND_VERSION)
|
||||
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,69 +0,0 @@
|
||||
diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake
|
||||
--- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200
|
||||
+++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
possibilities. List of vendors valid in this module:
|
||||
|
||||
* ``Goto``
|
||||
+ * ``FlexiBLAS``
|
||||
* ``OpenBLAS``
|
||||
* ``FLAME``
|
||||
* ``ATLAS PhiPACK``
|
||||
@@ -538,6 +539,22 @@
|
||||
""
|
||||
""
|
||||
""
|
||||
+ )
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
+# FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
|
||||
+if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
|
||||
+ if(NOT BLAS_LIBRARIES)
|
||||
+ check_blas_libraries(
|
||||
+ BLAS_LIBRARIES
|
||||
+ BLAS
|
||||
+ sgemm
|
||||
+ ""
|
||||
+ "flexiblas"
|
||||
+ ""
|
||||
+ ""
|
||||
+ ""
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake cmake-3.18.2/Modules/FindLAPACK.cmake
|
||||
--- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200
|
||||
+++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
If set, checks only the specified vendor, if not set checks all the
|
||||
possibilities. List of vendors valid in this module:
|
||||
|
||||
+ * ``FlexiBLAS``
|
||||
* ``OpenBLAS``
|
||||
* ``FLAME``
|
||||
* ``Intel10_32`` (intel mkl v10 32 bit)
|
||||
@@ -349,6 +350,23 @@
|
||||
""
|
||||
""
|
||||
""
|
||||
+ "${BLAS_LIBRARIES}"
|
||||
+ )
|
||||
+ endif()
|
||||
+ endif()
|
||||
+
|
||||
+ # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
|
||||
+ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
|
||||
+ if(NOT LAPACK_LIBRARIES)
|
||||
+ check_lapack_libraries(
|
||||
+ LAPACK_LIBRARIES
|
||||
+ LAPACK
|
||||
+ cheev
|
||||
+ ""
|
||||
+ "flexiblas"
|
||||
+ ""
|
||||
+ ""
|
||||
+ ""
|
||||
"${BLAS_LIBRARIES}"
|
||||
)
|
||||
endif()
|
@ -1,7 +1,7 @@
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
|
||||
@ -11,10 +11,10 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
||||
set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=")
|
||||
set(CMAKE_Fortran_MODPATH_FLAG "-p")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
|
||||
@ -24,10 +24,10 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
||||
set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
|
||||
set(CMAKE_Fortran_VERBOSE_FLAG "-v")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/GNU.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/GNU.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/GNU.cmake
|
||||
@@ -55,7 +55,7 @@ macro(__compiler_gnu lang)
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
|
||||
@ -37,11 +37,11 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
|
||||
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
|
||||
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
@@ -19,7 +19,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
|
||||
|
||||
# No -DNDEBUG for Fortran.
|
||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
|
||||
@ -50,10 +50,10 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
|
||||
# No -isystem for Fortran because it will not find .mod files.
|
||||
unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/Intel.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/Intel.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/Intel.cmake
|
||||
@@ -22,7 +22,7 @@ else()
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
|
||||
@ -63,11 +63,11 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
||||
|
||||
set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
@@ -51,7 +51,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
|
||||
set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
|
||||
string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
|
||||
@ -76,10 +76,10 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
|
||||
string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
|
||||
endif()
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/PathScale.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
|
||||
@ -88,10 +88,10 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
|
||||
endmacro()
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Compiler/PGI.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Compiler/PGI.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Compiler/PGI.cmake
|
||||
@@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
|
||||
@ -101,63 +101,11 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
|
||||
|
||||
if(CMAKE_HOST_WIN32)
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
|
||||
Index: cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
|
||||
@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG
|
||||
string(APPEND CMAKE_ASM_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
|
||||
# Initialize ASM link type selection flags. These flags are used when
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
|
||||
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
|
||||
set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
|
||||
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG
|
||||
string(APPEND CMAKE_CXX_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
|
||||
set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
|
||||
@@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA
|
||||
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
|
||||
set(CMAKE_Fortran_MODPATH_FLAG "-M")
|
||||
Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
|
||||
@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang)
|
||||
--- cmake-3.22.0-rc1.orig/Modules/Platform/Windows-Clang.cmake
|
||||
+++ cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake
|
||||
@@ -92,7 +92,7 @@ macro(__windows_compiler_clang_gnu lang)
|
||||
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
||||
Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake
|
||||
===================================================================
|
||||
--- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake
|
||||
+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
||||
@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
|
||||
--- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake
|
||||
+++ cmake-3.23.0-rc2/Modules/FindRuby.cmake
|
||||
@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
|
||||
_RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
|
||||
_RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
|
||||
|
||||
|
@ -1,21 +1,18 @@
|
||||
Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
||||
Index: cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
||||
@@ -25,12 +25,14 @@ endif()
|
||||
--- cmake-3.23.0-rc2.orig/Modules/Platform/Windows-GNU.cmake
|
||||
+++ cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake
|
||||
@@ -24,11 +24,11 @@ set(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
|
||||
set(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib
|
||||
|
||||
if(MINGW)
|
||||
set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
|
||||
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
|
||||
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
|
||||
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
|
||||
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
|
||||
+ set(CMAKE_DL_LIBS "dl")
|
||||
+else()
|
||||
+ set(CMAKE_DL_LIBS "")
|
||||
endif()
|
||||
set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
|
||||
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
|
||||
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
|
||||
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
|
||||
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
|
||||
|
||||
-set(CMAKE_DL_LIBS "")
|
||||
+set(CMAKE_DL_LIBS "dl")
|
||||
set(CMAKE_LIBRARY_PATH_FLAG "-L")
|
||||
set(CMAKE_LINK_LIBRARY_FLAG "-l")
|
||||
set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough
|
||||
|
254
cmake.spec
254
cmake.spec
@ -32,11 +32,14 @@
|
||||
# Enable RPM dependency generators for cmake files written in Python
|
||||
%bcond_without rpm
|
||||
|
||||
# Sphinx-build cannot import CMakeLexer on EPEL <= 6
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
%bcond_with sphinx
|
||||
%else
|
||||
%bcond_without sphinx
|
||||
|
||||
%if !0%{?rhel}
|
||||
%bcond_with bundled_jsoncpp
|
||||
%bcond_with bundled_rhash
|
||||
%else
|
||||
%bcond_without bundled_jsoncpp
|
||||
%bcond_without bundled_rhash
|
||||
%endif
|
||||
|
||||
# Run tests
|
||||
@ -45,6 +48,9 @@
|
||||
# Enable X11 tests
|
||||
%bcond_without X11_test
|
||||
|
||||
# Do not build non-lto objects to reduce build time significantly.
|
||||
%global optflags %(echo '%{optflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
|
||||
|
||||
# Place rpm-macros into proper location
|
||||
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
@ -55,21 +61,21 @@
|
||||
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
|
||||
|
||||
%global major_version 3
|
||||
%global minor_version 18
|
||||
%global minor_version 24
|
||||
# Set to RC version if building RC, else %%{nil}
|
||||
#global rcsuf rc1
|
||||
#global rcsuf %%{nil}
|
||||
%{?rcsuf:%global relsuf .%{rcsuf}}
|
||||
%{?rcsuf:%global versuf -%{rcsuf}}
|
||||
|
||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||
%global baserelease 3
|
||||
%global baserelease 1
|
||||
|
||||
# Uncomment if building for EPEL
|
||||
#global name_suffix %%{major_version}
|
||||
%global orig_name cmake
|
||||
|
||||
Name: %{orig_name}%{?name_suffix}
|
||||
Version: %{major_version}.%{minor_version}.4
|
||||
Version: %{major_version}.%{minor_version}.1
|
||||
Release: %{baserelease}%{?relsuf}%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
|
||||
@ -97,22 +103,16 @@ Source5: %{name}.req
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
||||
Patch100: %{name}-findruby.patch
|
||||
# replace release flag -O3 with -O2 for fedora
|
||||
%if 0%{?fedora} && 0%{?fedora} < 34
|
||||
Patch101: %{name}-fedora-flag_release.patch
|
||||
%endif
|
||||
# Add dl to CMAKE_DL_LIBS on MINGW
|
||||
# https://gitlab.kitware.com/cmake/cmake/issues/17600
|
||||
Patch102: %{name}-mingw-dl.patch
|
||||
# rhbz#1871346
|
||||
Patch103: %{name}-3.18.3-findblas.patch
|
||||
# Add Python 3.10 to the hadcoded lists of Python versions
|
||||
Patch104: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5383.patch
|
||||
Patch105: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5482.patch
|
||||
|
||||
# Patch for renaming on EPEL
|
||||
%if 0%{?name_suffix:1}
|
||||
Patch1: %{name}-rename.patch
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
Patch2: %{name}-libarchive3.patch
|
||||
%endif
|
||||
%endif
|
||||
|
||||
BuildRequires: coreutils
|
||||
@ -139,14 +139,22 @@ BuildRequires: %{_bindir}/sphinx-build
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: expat-devel
|
||||
%if %{with bundled_jsoncpp}
|
||||
Provides: bundled(jsoncpp)
|
||||
%else
|
||||
BuildRequires: jsoncpp-devel
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
BuildRequires: libarchive-devel
|
||||
%else
|
||||
BuildRequires: libarchive3-devel
|
||||
%endif
|
||||
BuildRequires: libuv-devel
|
||||
%if %{with bundled_rhash}
|
||||
Provides: bundled(rhash)
|
||||
%else
|
||||
BuildRequires: rhash-devel
|
||||
%endif
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: vim-filesystem
|
||||
@ -163,7 +171,6 @@ BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python2-devel
|
||||
%endif
|
||||
%endif
|
||||
#BuildRequires: xmlrpc-c-devel
|
||||
%if %{with gui}
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
@ -173,10 +180,14 @@ BuildRequires: pkgconfig(QtGui)
|
||||
BuildRequires: desktop-file-utils
|
||||
%endif
|
||||
|
||||
BuildRequires: pkgconfig(bash-completion)
|
||||
%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '%{_datadir}/bash-completion/completions')
|
||||
|
||||
%if %{without bootstrap}
|
||||
# Ensure we have our own rpm-macros in place during build.
|
||||
BuildRequires: %{name}-rpm-macros
|
||||
%endif
|
||||
BuildRequires: make
|
||||
|
||||
Requires: %{name}-data = %{version}-%{release}
|
||||
Requires: %{name}-rpm-macros = %{version}-%{release}
|
||||
@ -291,19 +302,32 @@ FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS
|
||||
SRCDIR="$(/usr/bin/pwd)"
|
||||
mkdir %{_vpath_builddir}
|
||||
pushd %{_vpath_builddir}
|
||||
$SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
|
||||
--docdir=/share/doc/%{name} --mandir=/share/man \
|
||||
$SRCDIR/bootstrap --prefix=%{_prefix} \
|
||||
--datadir=/share/%{name} \
|
||||
--docdir=/share/doc/%{name} \
|
||||
--mandir=/share/man \
|
||||
--%{?with_bootstrap:no-}system-libs \
|
||||
--parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
|
||||
--parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \
|
||||
%if %{with bundled_rhash}
|
||||
--no-system-librhash \
|
||||
%endif
|
||||
%if %{with bundled_jsoncpp}
|
||||
--no-system-jsoncpp \
|
||||
%endif
|
||||
%if %{with sphinx}
|
||||
--sphinx-man --sphinx-html \
|
||||
%else
|
||||
--sphinx-build=%{_bindir}/false \
|
||||
%endif
|
||||
--%{!?with_gui:no-}qt-gui \
|
||||
;
|
||||
-- \
|
||||
-DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \
|
||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
|
||||
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF
|
||||
popd
|
||||
%make_build -C %{_vpath_builddir} VERBOSE=1
|
||||
%make_build -C %{_vpath_builddir}
|
||||
|
||||
|
||||
%install
|
||||
@ -315,12 +339,7 @@ find %{buildroot}%{_datadir}/%{name}/Modules -type f | xargs chmod -x
|
||||
exit 1
|
||||
# Install major_version name links
|
||||
%{!?name_suffix:for f in ccmake cmake cpack ctest; do ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; done}
|
||||
# Install bash completion symlinks
|
||||
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
|
||||
for f in %{buildroot}%{_datadir}/%{name}/completions/*
|
||||
do
|
||||
ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions
|
||||
done
|
||||
|
||||
%if %{with emacs}
|
||||
# Install emacs cmake mode
|
||||
mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} %{buildroot}%{_emacs_sitestartdir}
|
||||
@ -423,13 +442,13 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
|
||||
|
||||
%if %{with test}
|
||||
%check
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
|
||||
%endif
|
||||
pushd %{_vpath_builddir}
|
||||
# CTestTestUpload require internet access
|
||||
# CTestTestUpload and BundleUtilities require internet access
|
||||
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
|
||||
NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
|
||||
NO_TEST="CTestTestUpload|BundleUtilities"
|
||||
# Likely failing for GCC 12
|
||||
NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator"
|
||||
NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode"
|
||||
# kwsys.testProcess-{4,5} are flaky on s390x.
|
||||
%ifarch s390x
|
||||
NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
|
||||
@ -439,12 +458,10 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
|
||||
NO_TEST="$NO_TEST|curl"
|
||||
%endif
|
||||
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
|
||||
## do this only periodically, not for every build -- rdieter 20210429
|
||||
# Keep an eye on failing tests
|
||||
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
|
||||
#bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
|
||||
popd
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
@ -463,7 +480,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
||||
|
||||
%files data -f data_files.mf
|
||||
%{_datadir}/aclocal/%{name}.m4
|
||||
%{_datadir}/bash-completion
|
||||
%{bash_completionsdir}/c*
|
||||
%if %{with emacs}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%{_emacs_sitelispdir}/%{name}
|
||||
@ -512,16 +529,171 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
|
||||
* Thu Aug 18 2022 Björn Esser <besser82@fedoraproject.org> - 3.24.1-1
|
||||
- cmake-3.24.1
|
||||
|
||||
* Fri Aug 05 2022 Leigh Scott <leigh123linux@gmail.com> - 3.24.0-1
|
||||
- cmake-3.24.0
|
||||
|
||||
* Fri Jul 29 2022 Leigh Scott <leigh123linux@gmail.com> - 3.23.3-1
|
||||
- cmake-3.23.3
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.0-0.2.rc2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Feb 23 2022 Björn Esser <besser82@fedoraproject.org> - 3.23.0-0.1.rc2
|
||||
- cmake-3.23.0-rc2
|
||||
Fixes rhbz#2052100
|
||||
|
||||
* Tue Jan 25 2022 Björn Esser <besser82@fedoraproject.org> - 3.22.2-1
|
||||
- cmake-3.22.2
|
||||
Fixes rhbz#2045074
|
||||
|
||||
* Thu Jan 20 2022 Björn Esser <besser82@fedoraproject.org> - 3.22.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Björn Esser <besser82@fedoraproject.org> - 3.22.1-6
|
||||
- Add patch to fix compatibility of FortranCInterface with GCC gfortran 12 LTO
|
||||
Fixes rhbz#2041904
|
||||
- Skip tests failing with GCC 12
|
||||
|
||||
* Sun Dec 26 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-5
|
||||
- Backport two patches fixing regressions in FindBoost and FindGLUT
|
||||
|
||||
* Fri Dec 17 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-4
|
||||
- Backport patch to add support for Python >= 3.10 in FindBoost.cmake
|
||||
|
||||
* Thu Dec 16 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-3
|
||||
- Backport patch to add Boost 1.78 support
|
||||
|
||||
* Thu Dec 16 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.22.1-2
|
||||
- Backport patch to add Python 3.11 support
|
||||
|
||||
* Tue Dec 07 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-1
|
||||
- cmake-3.22.1
|
||||
Fixes rhbz#2029974
|
||||
|
||||
* Thu Dec 02 2021 Stephan Bergmann <sbergman@redhat.com> - 3.22.0-4
|
||||
- Fixes RPATH_CHANGE fails when shared object is a GNU ld script
|
||||
|
||||
* Wed Dec 01 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-3
|
||||
- Update fix for rhbz#2027118 with upstream solution
|
||||
|
||||
* Sun Nov 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-2
|
||||
- Add patch to partially revert incompatible changes in GNUInstallDirs.cmake
|
||||
Fixes rhbz#2027118
|
||||
|
||||
* Thu Nov 18 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.22.0-1
|
||||
- cmake-3.22.0 (#2024712)
|
||||
|
||||
* Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.6.rc3
|
||||
- cmake-3.22.0-rc3
|
||||
Fixes rhbz#2022785
|
||||
|
||||
* Wed Nov 03 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.5.rc2
|
||||
- Disable bootstrap build for jsoncpp
|
||||
|
||||
* Wed Nov 03 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.4.rc2
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
* Thu Oct 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.3.rc2
|
||||
- cmake-3.22.0-rc2
|
||||
Fixes rhbz#2018235
|
||||
- Remove debug compiler flag in macros.cmake (CMAKE_Fortran_FLAGS_RELEASE)
|
||||
Fixes rhbz#2017942
|
||||
|
||||
* Thu Oct 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.2.rc1
|
||||
- Revert previous changes to macros.cmake (-O2 -g)
|
||||
Fixes rhbz#2017942
|
||||
|
||||
* Thu Oct 14 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.1.rc1
|
||||
- cmake-3.22.0-rc1
|
||||
Fixes rhbz#2014190
|
||||
- Do not build non-lto objects to reduce build time significantly
|
||||
- Explicitly force optimization level 2 and debuginfo for release builds
|
||||
|
||||
* Mon Sep 20 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.3-1
|
||||
- cmake-3.21.3
|
||||
Fixes rhbz#2006054
|
||||
|
||||
* Wed Aug 25 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.2-1
|
||||
- cmake-3.21.2
|
||||
Fixes rhbz#1997708
|
||||
|
||||
* Tue Jul 27 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.1-1
|
||||
- cmake-3.21.1
|
||||
Fixes rhbz#1986449
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jul 15 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-5
|
||||
- cmake-3.21.0
|
||||
|
||||
* Thu Jul 08 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-4.rc3
|
||||
- cmake-3.21.0-rc3
|
||||
|
||||
* Mon Jul 05 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-3.rc2
|
||||
- cmake-3.21.0-rc2
|
||||
- Drop libdl patch for glibc >= 2.34, as it is upstreamed
|
||||
|
||||
* Tue Jun 29 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-2.rc1
|
||||
- Rebuilt with upstreamed cmake-3.20.4-glibc_libdl.patch
|
||||
|
||||
* Wed Jun 23 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-1.rc1
|
||||
- cmake-3.21.0-rc1 (#1975377)
|
||||
|
||||
* Mon Jun 21 2021 Björn Esser <besser82@fedoraproject.org> - 3.20.5-1
|
||||
- cmake-3.20.5 (#1942118)
|
||||
|
||||
* Fri Jun 18 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.20.4-1
|
||||
- cmake-3.20.4 (#1942118)
|
||||
- workaround libdl-related FTBFS (#1972535)
|
||||
|
||||
* Sun May 30 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.20.3-1
|
||||
- cmake-3.20.3
|
||||
|
||||
* Thu Apr 29 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.20.2-1
|
||||
- cmake-3.20.2 (#1942118)
|
||||
- bash-completion fixes (#1924340)
|
||||
- Release build type optimization options differ from upstream package (#1751155)
|
||||
- parse parallel build from %%_smp_mflags instead of _NPROCESSORS_ONLN
|
||||
- drop old dist references (rhel6)
|
||||
|
||||
* Mon Mar 15 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.7-1
|
||||
- cmake-3.19.7
|
||||
|
||||
* Thu Feb 25 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.6-2
|
||||
- cmake-3.19.6
|
||||
|
||||
* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.4-2
|
||||
- CMake warning when searching for Boost 1.75 (#1925355)
|
||||
|
||||
* Thu Jan 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.4-1
|
||||
- cmake-3.19.4
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jan 13 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.3-1
|
||||
- cmake-3.19.3
|
||||
|
||||
* Mon Jan 11 2021 Cristian Morales Vega <christian.morales.vega@gmail.com> - 3.19.2-1
|
||||
- Update to 3.19.2
|
||||
|
||||
* Tue Dec 15 2020 Tom Stellard <tstellar@redhat.com> - 3.18.4-4
|
||||
- Update BuildRequires for eln
|
||||
|
||||
* Fri Nov 20 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
|
||||
- Ensure CMake does not strip binaries with package builds
|
||||
|
||||
* Mon Nov 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.4-2
|
||||
- Add support for Python 3.10
|
||||
|
||||
* Tue Oct 13 10:03:16 CEST 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.4-1
|
||||
* Tue Oct 13 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.4-1
|
||||
- Update to 3.18.4
|
||||
|
||||
* Wed Sep 30 12:49:57 CEST 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.3-1
|
||||
* Wed Sep 30 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.3-1
|
||||
- Update to 3.18.3
|
||||
- Explicitly require make
|
||||
- Add patch to support FlexiBLAS
|
||||
|
21
gating.yaml
Normal file
21
gating.yaml
Normal file
@ -0,0 +1,21 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional
|
||||
baseos-ci.brew-build.tier1.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional
|
||||
baseos-ci.brew-build.tier1.functional}
|
6
plans/ci.fmf
Normal file
6
plans/ci.fmf
Normal file
@ -0,0 +1,6 @@
|
||||
summary: CI Gating Plan
|
||||
discover:
|
||||
how: fmf
|
||||
directory: tests
|
||||
execute:
|
||||
how: beakerlib
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
|
||||
SHA512 (cmake-3.24.1.tar.gz) = 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
|
||||
|
63
tests/cmake-testsuite-sanity/Makefile
Normal file
63
tests/cmake-testsuite-sanity/Makefile
Normal file
@ -0,0 +1,63 @@
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /tools/cmake/Sanity/cmake-testsuite-sanity
|
||||
# Description: cmake testing by upstream testsuite
|
||||
# Author: Michal Kolar <mkolar@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2021 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
export TEST=/tools/cmake/Sanity/cmake-testsuite-sanity
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE tests
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
run: $(FILES) build
|
||||
./runtest.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
test -x runtest.sh || chmod a+x runtest.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ $(BUILT_FILES)
|
||||
|
||||
|
||||
include /usr/share/rhts/lib/rhts-make.include
|
||||
|
||||
$(METADATA): Makefile
|
||||
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: cmake testing by upstream testsuite" >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 1h" >> $(METADATA)
|
||||
@echo "RunFor: cmake" >> $(METADATA)
|
||||
@echo "Requires: cmake dnf-utils rpm-build" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2+" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RHEL8" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
3
tests/cmake-testsuite-sanity/PURPOSE
Normal file
3
tests/cmake-testsuite-sanity/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
||||
PURPOSE of /tools/cmake/Sanity/cmake-testsuite-sanity
|
||||
Description: cmake testing by upstream testsuite
|
||||
Author: Michal Kolar <mkolar@redhat.com>
|
15
tests/cmake-testsuite-sanity/main.fmf
Normal file
15
tests/cmake-testsuite-sanity/main.fmf
Normal file
@ -0,0 +1,15 @@
|
||||
summary: cmake testing by upstream testsuite
|
||||
description: ''
|
||||
contact:
|
||||
- Michal Kolar <mkolar@redhat.com>
|
||||
component:
|
||||
- cmake
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- cmake
|
||||
- dnf-utils
|
||||
- rpm-build
|
||||
duration: 1h
|
||||
extra-summary: /tools/cmake/Sanity/cmake-testsuite-sanity
|
||||
extra-task: /tools/cmake/Sanity/cmake-testsuite-sanity
|
85
tests/cmake-testsuite-sanity/runtest.sh
Executable file
85
tests/cmake-testsuite-sanity/runtest.sh
Executable file
@ -0,0 +1,85 @@
|
||||
#!/bin/bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /tools/cmake/Sanity/cmake-testsuite-sanity
|
||||
# Description: cmake testing by upstream testsuite
|
||||
# Author: Michal Kolar <mkolar@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2021 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
BUILD_USER=${BUILD_USER:-cmkbld}
|
||||
TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-50}
|
||||
PACKAGE="cmake"
|
||||
REQUIRES="$PACKAGE rpm-build"
|
||||
if rlIsFedora; then
|
||||
REQUIRES="$REQUIRES dnf-utils"
|
||||
else
|
||||
REQUIRES="$REQUIRES yum-utils"
|
||||
fi
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlShowRunningKernel
|
||||
rlAssertRpm --all
|
||||
rlRun "TmpDir=`mktemp -d`"
|
||||
rlRun "cp tests $TmpDir"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlFetchSrcForInstalled $PACKAGE
|
||||
rlRun "useradd -M -N $BUILD_USER" 0,9
|
||||
[ "$?" == "0" ] && rlRun "del=yes"
|
||||
rlRun "chown -R $BUILD_USER:users $TmpDir"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartSetup "build cmake"
|
||||
rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm"
|
||||
rlRun "dnf builddep -y $TmpDir/SPECS/*.spec"
|
||||
rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
|
||||
rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
|
||||
rlRun "cd $TmpDir/BUILD/cmake*"
|
||||
rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER"
|
||||
rlRun "rlFileSubmit $TmpDir/bootstrap.log"
|
||||
rlRun "ln -s /usr/bin/cmake bin/cmake"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "run testsuite"
|
||||
while read test; do
|
||||
rlRun "su -c '/usr/bin/ctest -R \"$test\" &>>$TmpDir/testsuite.log' $BUILD_USER"
|
||||
done <$TmpDir/tests
|
||||
rlRun "rlFileSubmit $TmpDir/testsuite.log"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "evaluate results"
|
||||
rlRun "cd $TmpDir"
|
||||
rlRun "grep -E '\*\*\*(F|f)ailed' testsuite.log" 1 "There should be no failure"
|
||||
rlRun "tests_count=\$(grep -E 'Test #[0-9]+: .+\.\.\. (P|p)assed' testsuite.log | wc -l)"
|
||||
[ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $TmpDir"
|
||||
[ "$del" == "yes" ] && rlRun "userdel -f $BUILD_USER"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
85
tests/cmake-testsuite-sanity/tests
Normal file
85
tests/cmake-testsuite-sanity/tests
Normal file
@ -0,0 +1,85 @@
|
||||
RunCMake.CMakeRoleGlobalProperty
|
||||
RunCMake.CompilerChange
|
||||
RunCMake.CompilerNotFound
|
||||
RunCMake.DisallowedCommands
|
||||
RunCMake.ExportCompileCommands
|
||||
RunCMake.ExcludeFromAll
|
||||
RunCMake.ExternalData
|
||||
RunCMake.FeatureSummary
|
||||
RunCMake.GeneratorInstance
|
||||
RunCMake.GeneratorPlatform
|
||||
RunCMake.GeneratorToolset
|
||||
RunCMake.GetPrerequisites
|
||||
RunCMake.GNUInstallDirs
|
||||
RunCMake.Languages
|
||||
RunCMake.LinkStatic
|
||||
RunCMake.ParseImplicitIncludeInfo
|
||||
RunCMake.ParseImplicitLinkInfo
|
||||
RunCMake.ScriptMode
|
||||
RunCMake.TargetObjects
|
||||
RunCMake.TargetProperties
|
||||
RunCMake.ToolchainFile
|
||||
RunCMake.find_dependency
|
||||
RunCMake.CompileDefinitions
|
||||
RunCMake.PolicyScope
|
||||
RunCMake.WriteBasicConfigVersionFile
|
||||
RunCMake.SourceProperties
|
||||
RunCMake.WorkingDirectory
|
||||
RunCMake.add_custom_target
|
||||
RunCMake.add_dependencies
|
||||
RunCMake.add_executable
|
||||
RunCMake.build_command
|
||||
RunCMake.cmake_minimum_required
|
||||
RunCMake.cmake_parse_arguments
|
||||
RunCMake.continue
|
||||
RunCMake.ctest_cmake_error
|
||||
RunCMake.ctest_configure
|
||||
RunCMake.ctest_coverage
|
||||
RunCMake.ctest_start
|
||||
RunCMake.ctest_disabled_test
|
||||
RunCMake.ctest_skipped_test
|
||||
RunCMake.ctest_update
|
||||
RunCMake.ctest_upload
|
||||
RunCMake.file-CHMOD
|
||||
RunCMake.find_file
|
||||
RunCMake.find_library
|
||||
RunCMake.find_path
|
||||
RunCMake.find_program
|
||||
RunCMake.foreach
|
||||
RunCMake.function
|
||||
RunCMake.get_filename_component
|
||||
RunCMake.get_property
|
||||
RunCMake.if
|
||||
RunCMake.include
|
||||
RunCMake.include_directories
|
||||
RunCMake.include_guard
|
||||
RunCMake.load_cache
|
||||
RunCMake.math
|
||||
RunCMake.message
|
||||
RunCMake.option
|
||||
RunCMake.project_injected
|
||||
RunCMake.return
|
||||
RunCMake.separate_arguments
|
||||
RunCMake.set_property
|
||||
RunCMake.string
|
||||
RunCMake.test_include_dirs
|
||||
RunCMake.BundleUtilities
|
||||
RunCMake.try_run
|
||||
RunCMake.set
|
||||
RunCMake.variable_watch
|
||||
RunCMake.while
|
||||
RunCMake.TargetPolicies
|
||||
RunCMake.no_install_prefix
|
||||
RunCMake.SymlinkTrees
|
||||
RunCMake.File_Archive
|
||||
RunCMake.File_Configure
|
||||
RunCMake.ExportWithoutLanguage
|
||||
RunCMake.target_compile_definitions
|
||||
RunCMake.target_compile_options
|
||||
RunCMake.target_include_directories
|
||||
RunCMake.target_sources
|
||||
RunCMake.CommandLineTar
|
||||
RunCMake.CPackCommandLine
|
||||
RunCMake.CacheNewline
|
||||
RunCMake.CPackSymlinks
|
||||
RunCMake.CTestCommandExpandLists
|
Loading…
Reference in New Issue
Block a user