From ff8467c934208cca6ec254311ce981dc58dce0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 28 Oct 2021 10:31:51 +0200 Subject: [PATCH] Revert previous changes to marcos.cmake (-O2 -g) Fixes rhbz#2017942 --- cmake.spec | 6 +++++- macros.cmake | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index d934bf2..23b27fb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -526,6 +526,10 @@ popd %changelog +* Thu Oct 28 2021 Björn Esser - 3.22.0-0.2.rc1 +- Revert previous changes to marcos.cmake (-O2 -g) + Fixes rhbz#2017942 + * Thu Oct 14 2021 Björn Esser - 3.22.0-0.1.rc1 - cmake-3.22.0-rc1 Fixes rhbz#2014190 diff --git a/macros.cmake b/macros.cmake index 3f24be0..7cfe7ec 100644 --- a/macros.cmake +++ b/macros.cmake @@ -29,9 +29,9 @@ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ - -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_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-g -DNDEBUG" \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\