diff --git a/mingw-qt5-qttools.spec b/mingw-qt5-qttools.spec index 2ff45dc..1e585e4 100644 --- a/mingw-qt5-qttools.spec +++ b/mingw-qt5-qttools.spec @@ -21,7 +21,7 @@ Name: mingw-qt5-%{qt_module} Version: 5.3.0 -Release: 1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} +Release: 2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} Summary: Qt5 for Windows - QtTools component License: GPLv3 with exceptions or LGPLv2 with exceptions @@ -59,6 +59,9 @@ BuildRequires: mingw64-qt5-qmldevtools-devel # Compile fix Patch0: 82d7e1d3b4b860911ff9c784cb22e9e47d0efb2e.patch +# Hack to workaround build failure on arm when using GCC 4.9 +Patch1: qttools-workaround-gcc49-arm-build-failure.patch + %description This package contains the Qt software toolkit for developing @@ -124,6 +127,9 @@ Fedora Windows cross-compiler. %prep %setup -q -n %{source_folder} %patch0 -p1 +%ifarch %{arm} +%patch1 -p0 +%endif %build @@ -275,6 +281,9 @@ done %changelog +* Fri May 30 2014 Erik van Pienbroek - 5.3.0-2 +- Disable c++11 support on arm to workaround internal compiler error in mingw-gcc 4.9 + * Sat May 24 2014 Erik van Pienbroek - 5.3.0-1 - Update to 5.3.0 diff --git a/qttools-workaround-gcc49-arm-build-failure.patch b/qttools-workaround-gcc49-arm-build-failure.patch new file mode 100644 index 0000000..a9469ce --- /dev/null +++ b/qttools-workaround-gcc49-arm-build-failure.patch @@ -0,0 +1,8 @@ +--- src/linguist/shared/formats.pri.orig 2014-05-30 16:46:24.383539733 +0200 ++++ src/linguist/shared/formats.pri 2014-05-30 16:46:32.906676427 +0200 +@@ -20,3 +20,5 @@ + $$PWD/po.cpp \ + $$PWD/ts.cpp \ + $$PWD/xliff.cpp ++ ++QMAKE_CXXFLAGS_CXX11 =