[mingw-qt5-qtbase] Workaround for Fedora 20 ARM build failure

Erik van Pienbroek epienbro at fedoraproject.org
Sun Jul 6 23:07:00 UTC 2014


commit a7f9a4ee49167f5ba5331dadf22fa6f65838bd5d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Jul 7 01:07:11 2014 +0200

    Workaround for Fedora 20 ARM build failure

 mingw-qt5-qtbase.spec                        |   14 ++++++++++++++
 qt5-workaround-gcc48-arm-build-failure.patch |   11 +++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 87bc417..4cbdf93 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -120,6 +120,14 @@ Patch107:       qt5-use-system-zlib-in-host-libs.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1092465
 Patch108:       qt5-rename-qtmain-to-qt5main.patch
 
+# Ugly workaround for a build failure which only happens on arm (Fedora 20)
+# g++ -c -pipe -O2 -g -std=c++0x -fno-exceptions -Wall -W -D_REENTRANT -fPIE -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_EVDEV -DQT_QMLDEVTOOLS_LIB -DQDOC2_COMPAT -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION -DQT_QMAKE_LOCATION="/builddir/build/BUILD/build_release_static_win32/bin/qmake" -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/mkspecs/linux-g++ -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/src/tools/qdoc -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/src/tools/qdoc -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/src/tools/qdoc/qmlparser -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/include -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/include/QtCore -I/builddir/build/BUILD/qtbase-opensource-src-
 5.3.1/include/QtXml -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/include/QtCore/5.3.1 -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/include/QtCore/5.3.1/QtCore -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/include/QtXml/5.3.1 -I/builddir/build/BUILD/qtbase-opensource-src-5.3.1/include/QtXml/5.3.1/QtXml -I../../../include -I../../../include/QtCore -I/builddir/build/BUILD/build_release_static_win32/include/QtXml -I. -o .obj/quoter.o /builddir/build/BUILD/qtbase-opensource-src-5.3.1/src/tools/qdoc/quoter.cpp
+# /builddir/build/BUILD/qtbase-opensource-src-5.3.1/src/tools/qdoc/quoter.cpp: In constructor 'Quoter::Quoter()':
+# /builddir/build/BUILD/qtbase-opensource-src-5.3.1/src/tools/qdoc/quoter.cpp:139:1: internal compiler error: in add_stores, at var-tracking.c:5918
+# }
+# ^
+Patch109:       qt5-workaround-gcc48-arm-build-failure.patch
+
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
@@ -274,6 +282,12 @@ Static version of the mingw64-qt5-qtbase library.
 %patch107 -p1 -b .host_system_zlib
 %patch108 -p1 -b .qtmain
 
+%if 0%{?fedora} == 20
+%ifarch %{arm}
+%patch109 -p0 -b .arm
+%endif
+%endif
+
 # Make sure the Qt5 build system uses our external ANGLE library
 rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,KHR}
 
diff --git a/qt5-workaround-gcc48-arm-build-failure.patch b/qt5-workaround-gcc48-arm-build-failure.patch
new file mode 100644
index 0000000..e112ef4
--- /dev/null
+++ b/qt5-workaround-gcc48-arm-build-failure.patch
@@ -0,0 +1,11 @@
+--- src/tools/qdoc/qdoc.pro.orig	2014-07-06 21:10:09.054048842 +0200
++++ src/tools/qdoc/qdoc.pro	2014-07-06 21:11:00.960577053 +0200
+@@ -74,6 +74,8 @@
+            tree.cpp \
+            yyindent.cpp
+ 
++QMAKE_CXXFLAGS_CXX11 =
++
+ ### QML/JS Parser ###
+ 
+ include(qmlparser/parser.pri)


More information about the scm-commits mailing list