rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build only qtscript using -O1 (#1580047)

This commit is contained in:
Rex Dieter 2018-05-19 20:19:00 -05:00
parent b8bea37602
commit 1d3b52daaf
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 qt-everywhere-opensource-src-4.8.7/src/script/script.pro
--- qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 2015-05-07 09:14:43.000000000 -0500
+++ qt-everywhere-opensource-src-4.8.7/src/script/script.pro 2018-05-19 16:01:24.699926959 -0500
@@ -91,6 +91,9 @@ symbian {
TARGET.UID3=0x2001B2E1
}
+# hack around gcc8 optimization bug with -O2
+QMAKE_CXXFLAGS_RELEASE += -O1
+
symbian {
symbian-abld|symbian-sbsv2 {
MMP_RULES += ALWAYS_BUILD_AS_ARM

30
qt.spec
View File

@ -40,7 +40,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.7
Release: 39%{?dist}
Release: 40%{?dist}
# 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
@ -197,6 +197,10 @@ Patch94: qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch
# https://build.opensuse.org/package/view_file/KDE:Qt/libqt4/fix-build-icu59.patch?expand=1
Patch95: qt-everywhere-opensource-src-4.8.7-icu59.patch
# workaround qtscript failures when building with f28's gcc8
# https://bugzilla.redhat.com/show_bug.cgi?id=1580047
Patch96: qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch
# upstream patches
# backported from Qt5 (essentially)
# http://bugzilla.redhat.com/702493
@ -630,6 +634,9 @@ rm -rf src/3rdparty/clucene
%patch93 -p1 -b .alsa1.1
%patch94 -p1 -b .openssl1.1
%patch95 -p1 -b .icu59
%if 0%{?fedora} > 27
%patch96 -p1 -b .gcc8_qtscript
%endif
# upstream patches
%patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check
@ -657,16 +664,6 @@ rm -rf src/3rdparty/clucene
%define platform linux-g++
%endif
# workaround qtscript failures when building with f28's gcc8
# https://bugzilla.redhat.com/show_bug.cgi?id=1580047
# probably an overly big hammer to build *all* of qt instead of just qtscript
# leaving that as a fixme/todo
%if 0%{?fedora} > 27
sed -i -e 's|-O2|-O1|g' \
mkspecs/common/gcc-base.conf \
mkspecs/common/g++-base.conf
%endif
%if 0%{?inject_optflags}
%patch2 -p1 -b .multilib-optflags
# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
@ -724,14 +721,6 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
export MAKEFLAGS="%{?_smp_mflags}"
# workaround qtscript failures when building with f28's gcc8
# https://bugzilla.redhat.com/show_bug.cgi?id=1580047
# probably an overly big hammer to build *all* of qt instead of just qtscript
# leaving that as a fixme/todo
%if 0%{?fedora} > 27
export CXXFLAGS="$CXXFLAGS -O1"
%endif
./configure -v \
-confirm-license \
-opensource \
@ -1414,6 +1403,9 @@ fi
%changelog
* Sat May 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-40
- build only qtscript using -O1 (#1580047)
* Sat May 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-39
- workaround qtscript/gcc8 bug (#1580047)