rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Explicitly force optimization level 2 and debuginfo for release builds

Browse Source
This commit is contained in:
Björn Esser 2021-10-14 18:12:44 +02:00
parent ff5639876b
commit 7e4503e30d
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake.spec
View File

@ -302,8 +302,10 @@ FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS
SRCDIR="$(/usr/bin/pwd)" SRCDIR="$(/usr/bin/pwd)"
mkdir %{_vpath_builddir} mkdir %{_vpath_builddir}
pushd %{_vpath_builddir} pushd %{_vpath_builddir}
$SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ $SRCDIR/bootstrap --prefix=%{_prefix} \
--docdir=/share/doc/%{name} --mandir=/share/man \ --datadir=/share/%{name} \
--docdir=/share/doc/%{name} \
--mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \ --%{?with_bootstrap:no-}system-libs \
--parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \ --parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \
%if %{with bundled_rhash} %if %{with bundled_rhash}
@ -318,9 +320,14 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
--sphinx-build=%{_bindir}/false \ --sphinx-build=%{_bindir}/false \
%endif %endif
--%{!?with_gui:no-}qt-gui \ --%{!?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 popd
%make_build -C %{_vpath_builddir} VERBOSE=1 %make_build -C %{_vpath_builddir}
%install %install
@ -523,6 +530,7 @@ popd
- cmake-3.22.0-rc1 - cmake-3.22.0-rc1
Fixes rhbz#2014190 Fixes rhbz#2014190
- Do not build non-lto objects to reduce build time significantly - 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 * Mon Sep 20 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.3-1
- cmake-3.21.3 - cmake-3.21.3

6
macros.cmake
View File

@ -29,9 +29,9 @@
%__cmake \\\ %__cmake \\\
%{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
%{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\