macros.qt4 : cleanup, introduce %_qt4_optflags, %_qt4_ldflags, %_qt4_qmake_flags
This commit is contained in:
parent
404cd30436
commit
6f7261dc5f
18
macros.qt4
18
macros.qt4
|
@ -18,12 +18,16 @@
|
||||||
%_qt4_sysconfdir %{_sysconfdir}
|
%_qt4_sysconfdir %{_sysconfdir}
|
||||||
%_qt4_translationdir %{_datadir}/qt4/translations
|
%_qt4_translationdir %{_datadir}/qt4/translations
|
||||||
|
|
||||||
%qmake_qt4 %{_qt4_qmake} \\\
|
%_qt4_ldflags %{?__global_ldflags}
|
||||||
QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\
|
%_qt4_optflags %{optflags}
|
||||||
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\
|
|
||||||
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\
|
%_qt4_qmake_flags \\\
|
||||||
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%optflags}" \\\
|
QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt4_optflags}}" \\\
|
||||||
QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{?__global_ldflags}}" \\\
|
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt4_optflags}}" \\\
|
||||||
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{?__global_ldflags}}" \\\
|
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_STRIP=
|
||||||
|
|
||||||
|
%qmake_qt4 %{_qt4_qmake} %{_qt4_qmake_flags}
|
||||||
|
|
5
qt.spec
5
qt.spec
|
@ -44,7 +44,7 @@ Summary: Qt toolkit
|
||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.7
|
Version: 4.8.7
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# 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
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
|
@ -1332,6 +1332,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-7
|
||||||
|
- macros.qt4 : cleanup, introduce %%_qt4_optflags, %%_qt4_ldflags, %%_qt4_qmake_flags
|
||||||
|
|
||||||
* Thu Nov 26 2015 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-6
|
* Thu Nov 26 2015 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-6
|
||||||
- don't inject $RPM_OPT_FLAGS/$RPM_LD_FLAGS into qmake defaults (#1279265)
|
- don't inject $RPM_OPT_FLAGS/$RPM_LD_FLAGS into qmake defaults (#1279265)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue