From b9fa0dba36ceb72e61a5910c542d6ab5a2277711 Mon Sep 17 00:00:00 2001 From: tiberium Date: Fri, 5 Apr 2024 17:21:55 +0800 Subject: [PATCH] fix cmake compile issue due to cxx standard check failed (cherry picked from commit 83f6533e84d6ed6d66cbb605120a9660564b5c46) --- cmake-3.27.9-fix-cxx-standard-check-issue.patch | 13 +++++++++++++ cmake.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 cmake-3.27.9-fix-cxx-standard-check-issue.patch diff --git a/cmake-3.27.9-fix-cxx-standard-check-issue.patch b/cmake-3.27.9-fix-cxx-standard-check-issue.patch new file mode 100644 index 0000000..af9e6a6 --- /dev/null +++ b/cmake-3.27.9-fix-cxx-standard-check-issue.patch @@ -0,0 +1,13 @@ +diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake +index 02627464..4f6ccdaf 100644 +--- a/Source/Checks/cm_cxx_features.cmake ++++ b/Source/Checks/cm_cxx_features.cmake +@@ -44,6 +44,8 @@ function(cm_check_cxx_feature name) + string(REGEX REPLACE "[^\n]*warning D[0-9][0-9][0-9][0-9][^\n]*" "" check_output "${check_output}") + # Filter out warnings caused by user flags. + string(REGEX REPLACE "[^\n]*warning:[^\n]*-Winvalid-command-line-argument[^\n]*" "" check_output "${check_output}") ++ # Filter out clang output warnings ++ string(REGEX REPLACE "[^\n]*warning:[^\n]*-Wunused-command-line-argument[^\n]*" "" check_output "${check_output}") + # Filter out warnings caused by local configuration. + string(REGEX REPLACE "[^\n]*warning:[^\n]*directory not found for option[^\n]*" "" check_output "${check_output}") + string(REGEX REPLACE "[^\n]*warning:[^\n]*object file compiled with -mlong-branch which is no longer needed[^\n]*" "" check_output "${check_output}") diff --git a/cmake.spec b/cmake.spec index a239562..e692259 100644 --- a/cmake.spec +++ b/cmake.spec @@ -11,7 +11,7 @@ Name: cmake Version: 3.27.9 -Release: 2 +Release: 3 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org @@ -25,6 +25,7 @@ Patch0: cmake-findruby.patch %ifarch sw_64 Patch1: cmake-3.22.0-sw.patch %endif +Patch2: cmake-3.27.9-fix-cxx-standard-check-issue.patch BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed BuildRequires: emacs python3-devel pkgconfig(Qt5Widgets) desktop-file-utils @@ -243,6 +244,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Fri Apr 5 2024 tiberium 3.27.9-3 +- fix cmake compile issue due to cxx standard check failed + * Fri Feb 2 2024 liyanan - 3.27.9-2 - Remove Windows_TemporaryKey.pfx