From 4bc3db1c9c0e4e16c8187b26411976ad10e21bb6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 06 2013 03:51:14 +0000 Subject: %ix86: cannot assume sse2 (and related support) or the JIT that requires it... disable. --- diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 7d001e8..13390a3 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -12,7 +12,7 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} Version: 5.2.0 -Release: 0.10.%{pre}%{?dist} +Release: 0.11.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -23,6 +23,9 @@ Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-% Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif +# fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them +Patch1: qtdeclarative-opensource-src-5.2.0-fedora_i686_flags.patch + Obsoletes: qt5-qtjsbackend < 5.2.0 BuildRequires: qt5-qtbase-devel >= %{version} @@ -62,6 +65,8 @@ BuildArch: noarch %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} +%patch1 -p1 -b .fedora_i686_flags + %build %{_qt5_qmake} @@ -151,6 +156,9 @@ popd %changelog +* Thu Dec 05 2013 Rex Dieter 5.2.0-0.11.rc1 +- %%ix86: cannot assume sse2 (and related support) or the JIT that requires it... disable. + * Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 - 5.2.0-rc1 diff --git a/qtdeclarative-opensource-src-5.2.0-fedora_i686_flags.patch b/qtdeclarative-opensource-src-5.2.0-fedora_i686_flags.patch new file mode 100644 index 0000000..d99cb36 --- /dev/null +++ b/qtdeclarative-opensource-src-5.2.0-fedora_i686_flags.patch @@ -0,0 +1,30 @@ +diff -up qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/jsruntime.pri.fedora_i686_flags qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/jsruntime.pri +--- qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/jsruntime.pri.fedora_i686_flags 2013-11-26 19:02:16.000000000 -0600 ++++ qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/jsruntime.pri 2013-12-05 21:48:03.545285131 -0600 +@@ -91,10 +91,10 @@ HEADERS += \ + + # Use SSE2 floating point math on 32 bit instead of the default + # 387 to make test results pass on 32 and on 64 bit builds. +-linux-g++*:isEqual(QT_ARCH,i386) { +- QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse +- QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse +-} ++#linux-g++*:isEqual(QT_ARCH,i386) { ++# QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse ++# QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse ++#} + + valgrind { + DEFINES += V4_USE_VALGRIND +diff -up qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/qv4global_p.h.fedora_i686_flags qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/qv4global_p.h +--- qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/qv4global_p.h.fedora_i686_flags 2013-11-26 19:02:16.000000000 -0600 ++++ qtdeclarative-opensource-src-5.2.0-rc1/src/qml/jsruntime/qv4global_p.h 2013-12-05 21:47:38.745545142 -0600 +@@ -70,7 +70,7 @@ inline double trunc(double d) { return d + + // White list architectures + +-#if defined(Q_PROCESSOR_X86) ++#if defined(Q_PROCESSOR_X86_NOT_ON_FEDORA) + #define V4_ENABLE_JIT + #elif defined(Q_PROCESSOR_X86_64) + #define V4_ENABLE_JIT