[kde-filesystem] Sync FFLAGS and LDFLAGS in the %cmake_kde4 macro with redhat-rpm-config (#737386)
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 6 20:57:29 UTC 2012
commit 81b74a391b5d34079c08d4f8bb78e1e3b025f74f
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Dec 6 14:57:37 2012 -0600
Sync FFLAGS and LDFLAGS in the %cmake_kde4 macro with redhat-rpm-config (#737386)
kde-filesystem.spec | 5 ++++-
macros.kde4 | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/kde-filesystem.spec b/kde-filesystem.spec
index 9d9b341..120ad59 100644
--- a/kde-filesystem.spec
+++ b/kde-filesystem.spec
@@ -17,7 +17,7 @@
Summary: KDE filesystem layout
Name: kde-filesystem
Version: 4
-Release: 41%{?dist}
+Release: 42%{?dist}
Group: System Environment/Base
License: Public Domain
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
%changelog
+* Thu Dec 06 2012 Ville Skyttä <ville.skytta at iki.fi> - 4-42
+- Sync FFLAGS and LDFLAGS in the %%cmake_kde4 macro with redhat-rpm-config (#737386)
+
* Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4-41
- macros.kde4: %%cmake_kde4 add -DKDE4_BUILD_TESTS=OFF
diff --git a/macros.kde4 b/macros.kde4
index 884bc81..b4d11da 100644
--- a/macros.kde4
+++ b/macros.kde4
@@ -13,7 +13,8 @@
PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
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} \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
-DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
More information about the scm-commits
mailing list