diff --git a/qt5-qttools.spec b/qt5-qttools.spec index f669e2f..da974cb 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -8,7 +8,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.7.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -24,6 +24,9 @@ Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch # 'make docs' crash on el6, use qSort instead of std::sort Patch3: qttools-opensource-src-5.6-QTBUG-43057.patch +# 32-bit MIPS needs explicit -latomic +Patch4: qttools-opensource-src-5.7-add-libatomic.patch + ## upstream patches Source20: assistant.desktop @@ -187,7 +190,9 @@ rm -rf src/assistant/3rdparty/clucene %endif %patch2 -p1 -b .qmake-qt5 %patch3 -p1 -b .QTBUG-43057 - +%ifarch %{mips32} +%patch4 -p1 -b .libatomic +%endif %build mkdir %{_target_platform} @@ -478,6 +483,9 @@ fi %changelog +* Fri Aug 12 2016 Michal Toman - 5.7.0-3 +- Add explicit -latomic on 32-bit MIPS + * Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0- - Compiled with gcc diff --git a/qttools-opensource-src-5.7-add-libatomic.patch b/qttools-opensource-src-5.7-add-libatomic.patch new file mode 100644 index 0000000..98edad3 --- /dev/null +++ b/qttools-opensource-src-5.7-add-libatomic.patch @@ -0,0 +1,11 @@ +diff -urp qttools-opensource-src-5.6.0-beta1/src/qtdiag/qtdiag.pro q/src/qtdiag/qtdiag.pro +--- qttools-opensource-src-5.6.0-beta1/src/qtdiag/qtdiag.pro 2015-10-30 11:48:01.000000000 +0100 ++++ q/src/qtdiag/qtdiag.pro 2016-04-30 08:45:22.099054040 +0200 +@@ -2,6 +2,7 @@ load(qt_app) + + CONFIG += console + QT += core-private gui-private ++LIBS += -latomic + + qtHaveModule(network) { + QT += network