From 6f7261dc5fd8257fcc69dfd15a5764dc1b79cc1b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 2 Feb 2016 18:04:57 -0600 Subject: [PATCH] macros.qt4 : cleanup, introduce %_qt4_optflags, %_qt4_ldflags, %_qt4_qmake_flags --- macros.qt4 | 18 +++++++++++------- qt.spec | 5 ++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/macros.qt4 b/macros.qt4 index 791a6dd..ca3e3be 100644 --- a/macros.qt4 +++ b/macros.qt4 @@ -18,12 +18,16 @@ %_qt4_sysconfdir %{_sysconfdir} %_qt4_translationdir %{_datadir}/qt4/translations -%qmake_qt4 %{_qt4_qmake} \\\ - QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\ - QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\ - QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%optflags}" \\\ - QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{?__global_ldflags}}" \\\ - QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{?__global_ldflags}}" \\\ +%_qt4_ldflags %{?__global_ldflags} +%_qt4_optflags %{optflags} + +%_qt4_qmake_flags \\\ + QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt4_optflags}}" \\\ + QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt4_optflags}}" \\\ + QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt4_optflags}}" \\\ + QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt4_optflags}}" \\\ + QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt4_ldflags}}" \\\ + QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt4_ldflags}}" \\\ QMAKE_STRIP= +%qmake_qt4 %{_qt4_qmake} %{_qt4_qmake_flags} diff --git a/qt.spec b/qt.spec index 6034a1e..9f7cf78 100644 --- a/qt.spec +++ b/qt.spec @@ -44,7 +44,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 6%{?dist} +Release: 7%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -1332,6 +1332,9 @@ fi %changelog +* Tue Feb 02 2016 Rex Dieter 1:4.8.7-7 +- macros.qt4 : cleanup, introduce %%_qt4_optflags, %%_qt4_ldflags, %%_qt4_qmake_flags + * Thu Nov 26 2015 Rex Dieter 1:4.8.7-6 - don't inject $RPM_OPT_FLAGS/$RPM_LD_FLAGS into qmake defaults (#1279265)