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

Sync FFLAGS and LDFLAGS in the %cmake macro with redhat-rpm-config.

Browse Source
This commit is contained in:
Orion Poplawski 2011-09-13 15:55:59 -06:00
parent 5fa4687978
commit d8fd6d266c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.spec
View File

@ -8,7 +8,7 @@
Name: cmake Name: cmake
Version: 2.8.6 Version: 2.8.6
Release: 0.2.rc2%{?dist} Release: 0.3.rc2%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Sun Sep 11 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.8.6-0.3.rc2
- Sync FFLAGS and LDFLAGS in the %%cmake macro with redhat-rpm-config.
* Tue Sep 6 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.2.rc2 * Tue Sep 6 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.2.rc2
- Update to 2.8.6 RC 2 - Update to 2.8.6 RC 2
- Drop aclocal patch - Drop aclocal patch

3
macros.cmake
View File

@ -9,7 +9,8 @@
%cmake \ %cmake \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
%__cmake \\\ %__cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\