diff --git a/cmake-3.22.0-sw.patch b/cmake-3.22.0-sw.patch index c191dbd..b2e7a2c 100755 --- a/cmake-3.22.0-sw.patch +++ b/cmake-3.22.0-sw.patch @@ -1,7 +1,7 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJNI.cmake --- cmake-3.22.0.org/Modules/FindJNI.cmake 2022-02-25 01:21:55.530000000 +0000 +++ cmake-3.22.0.sw/Modules/FindJNI.cmake 2022-02-25 01:30:19.530000000 +0000 -@@ -61,6 +61,8 @@ +@@ -150,6 +150,8 @@ set(_java_libarch "i386") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") set(_java_libarch "arm64" "aarch64") @@ -10,18 +10,19 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJN elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") set(_java_libarch "alpha") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -@@ -363,6 +365,7 @@ +@@ -509,6 +511,7 @@ ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux ${JAVA_INCLUDE_PATH}/alpha + ${JAVA_INCLUDE_PATH}/sw_64 ${JAVA_INCLUDE_PATH}/aix + DOC "jni_md.h jniport.h include directory" ) diff -Naur cmake-3.22.0.org/Modules/GNUInstallDirs.cmake cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake --- cmake-3.22.0.org/Modules/GNUInstallDirs.cmake 2022-02-25 01:21:55.550000000 +0000 +++ cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake 2022-02-25 01:32:38.270000000 +0000 -@@ -280,9 +280,9 @@ +@@ -286,9 +286,9 @@ elseif(NOT DEFINED __system_type_for_install) # not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P: if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") @@ -62,7 +63,7 @@ diff -Naur cmake-3.22.0.org/Utilities/cmlibrhash/librhash/byte_order.h cmake-3.2 diff -Naur cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c cmake-3.22.0.sw/Utilities/cmlibuv/src/win/util.c --- cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c 2022-02-25 01:21:57.830000000 +0000 +++ cmake-3.22.0.sw/Utilities/cmlibuv/src/win/util.c 2022-02-25 01:33:21.970000000 +0000 -@@ -1917,6 +1917,10 @@ +@@ -1849,6 +1849,10 @@ case PROCESSOR_ARCHITECTURE_MIPS: uv__strscpy(buffer->machine, "mips", sizeof(buffer->machine)); break; diff --git a/cmake-3.24.3.tar.gz b/cmake-3.27.9.tar.gz similarity index 55% rename from cmake-3.24.3.tar.gz rename to cmake-3.27.9.tar.gz index 8953492..978f497 100644 Binary files a/cmake-3.24.3.tar.gz and b/cmake-3.27.9.tar.gz differ diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch deleted file mode 100644 index 737e184..0000000 --- a/cmake-fedora-flag_release.patch +++ /dev/null @@ -1,117 +0,0 @@ -Index: cmake-3.22.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") - string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " ") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") - 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.22.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") - string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") - string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") - set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") - set(CMAKE_Fortran_VERBOSE_FLAG "-v") -Index: cmake-3.22.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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") - set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") - set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") -Index: cmake-3.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake -=================================================================== ---- 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") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") - - # No -isystem for Fortran because it will not find .mod files. - unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) -Index: cmake-3.22.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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") - - set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}") -Index: cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake -=================================================================== ---- 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") -- string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") -+ string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O2 -DNDEBUG") - string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") - string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") - endif() -Index: cmake-3.22.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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") - endmacro() -Index: cmake-3.22.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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O2") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") - - if(CMAKE_HOST_WIN32) -Index: cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake -=================================================================== ---- 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}") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}") - endif() - set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") - diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch deleted file mode 100644 index 9934788..0000000 --- a/cmake-mingw-dl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake -=================================================================== ---- 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 - - 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 diff --git a/cmake.prov b/cmake.prov index f569c23..58d3522 100644 --- a/cmake.prov +++ b/cmake.prov @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding:utf-8 -*- # # Copyright (C) 2015 Daniel Vrátil @@ -37,9 +37,16 @@ class CMakeParser: version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) if version: - print("cmake(%s) = %s" % (cmakeModule, version)) + string = "cmake(" + cmakeModule + ") = " + version else: - print("cmake(%s)" % cmakeModule) + string = "cmake(" + cmakeModule + ")" + if string == string.lower(): + print(string) + else: + # Temporarily print both variants to satisfy requires + # by the old version of this generator which made mistakes + print(string) + print(string.lower()) def parseCmakeModuleConfig(self, configFile): diff --git a/cmake.req b/cmake.req index 2a58ca3..9af5c44 100644 --- a/cmake.req +++ b/cmake.req @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding:utf-8 -*- # # Copyright (C) 2017 Björn Esser diff --git a/cmake.spec b/cmake.spec index dca13e0..9d20115 100644 --- a/cmake.spec +++ b/cmake.spec @@ -10,22 +10,20 @@ %{?rcsuf:%global versuf -%{rcsuf}} Name: cmake -Version: 3.24.3 -Release: 2 +Version: 3.27.9 +Release: 1 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org -Source0: https://www.cmake.org/files/v3.22/cmake-%{version}.tar.gz +Source0: https://www.cmake.org/files/v3.27/cmake-%{version}.tar.gz Source1: cmake-init.el Source2: macros.cmake Source3: cmake.attr Source4: cmake.prov Source5: cmake.req Patch0: cmake-findruby.patch -Patch1: cmake-fedora-flag_release.patch -Patch2: cmake-mingw-dl.patch %ifarch sw_64 -Patch3: cmake-3.22.0-sw.patch +Patch1: cmake-3.22.0-sw.patch %endif BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed @@ -49,7 +47,7 @@ BuildRequires: pkgconfig(bash-completion) Requires: cmake-data = %{version}-%{release} cmake-rpm-macros = %{version}-%{release} Requires: cmake-filesystem = %{version}-%{release} -Provides: cmake3 = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) +Provides: cmake3 = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) %description CMake is used to control the software compilation process using simple @@ -106,8 +104,11 @@ Documentation for cmake. %prep %autosetup -n cmake-%{version}%{?versuf} -p 1 -sed '1c #!%{__python3}' %{SOURCE4} > cmake.prov -sed '1c #!%{__python3}' %{SOURCE5} > cmake.req + +echo '#!%{__python3}' > %{name}.prov +echo '#!%{__python3}' > %{name}.req +tail -n +2 %{SOURCE4} >> %{name}.prov +tail -n +2 %{SOURCE5} >> %{name}.req %build export CFLAGS=`echo %{optflags} | sed 's/-g\b/-s/g'` @@ -119,6 +120,7 @@ pushd build --docdir=/share/doc/cmake --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ + --no-system-cppdap \ --no-system-librhash \ %if %{with sphinx} --sphinx-man --sphinx-html \ @@ -161,6 +163,9 @@ cp -p Utilities/cmexpat/COPYING ./COPYING_cmexpat install -d %{buildroot}%{_pkgdocdir} cp -pr %{buildroot}%{_datadir}/cmake/Help %{buildroot}%{_pkgdocdir} +cp -p Utilities/cmcppdap/LICENSE LICENSE.cppdap +cp -p Utilities/cmcppdap/NOTICE NOTICE.cppdap + desktop-file-install --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/cmake-gui.desktop @@ -199,6 +204,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f lib_files.mf %doc %dir %{_pkgdocdir} %license Copyright_* COPYING* Copyright.txt +%license LICENSE.cppdap NOTICE.cppdap %files data -f data_files.mf %{_datadir}/aclocal/cmake.m4 @@ -236,6 +242,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Fri Jan 5 2024 liyanan - 3.27.9-1 +- Update to 3.27.9 + * Thu Dec 14 2023 liyanan - 3.24.3-2 - Fix abnormal empty link in cmake-data package