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

macros: Directly use %set_build_flags, as it is supported since EPEL 7

Browse Source
This commit is contained in:
Björn Esser 2023-05-27 19:10:21 +02:00
parent e8ab29358a
commit 2a93bfd1de
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake.spec
View File

@ -538,6 +538,7 @@ popd
* Sat May 27 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.4-3 * Sat May 27 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.4-3
- Rename macros.cmake -> macros.cmake.in - Rename macros.cmake -> macros.cmake.in
- macros: Fix formatting and indentation - macros: Fix formatting and indentation
- macros: Directly use %%set_build_flags, as it is supported since EPEL 7
* Fri May 19 2023 Neal Gompa <ngompa@fedoraproject.org> - 3.26.4-2 * Fri May 19 2023 Neal Gompa <ngompa@fedoraproject.org> - 3.26.4-2
- macros: use the language build flag macros for compiler flags - macros: use the language build flag macros for compiler flags

10
macros.cmake.in
View File

@ -18,15 +18,7 @@
# - Set default install prefixes and library install directories # - Set default install prefixes and library install directories
# - Turn on shared libraries by default # - Turn on shared libraries by default
%cmake \ %cmake \
%if 0%{?set_build_flags:1} \ %{set_build_flags} \
%set_build_flags \
%else \
CFLAGS="${CFLAGS:-%build_cflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%build_cxxflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%build_fflags}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%build_fflags}" ; export FCFLAGS ; \
%{?build_ldflags:LDFLAGS="${LDFLAGS:-%build_ldflags}" ; export LDFLAGS ;} \
%endif \
%__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}"} \\\