rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

respin lowmem patch to apply (unconditinally) to gcc-4.7.2 too

Browse Source
This commit is contained in:
Rex Dieter 2013-04-18 19:36:31 -05:00
parent f4927b2dd4
commit d9f3301045
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qt5-qtbase.spec
View File

@ -8,7 +8,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.0.2 Version: 5.0.2
Release: 3%{?dist} Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -154,11 +154,9 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# lowmem hacks # lowmem hacks
%ifarch %{arm} s390 #ifarch %{arm} s390
## FIXME, -O2 still injected somewhere it seems -- rex
#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-O2|-O1|g'`
%patch1 -p1 -b .lowmem %patch1 -p1 -b .lowmem
%endif #endif
%define platform linux-g++ %define platform linux-g++
%ifarch %{multilib_archs} %ifarch %{multilib_archs}
@ -478,6 +476,9 @@ popd
%changelog %changelog
* Thu Apr 18 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-4
- respin lowmem patch to apply (unconditinally) to gcc-4.7.2 too
* Fri Apr 12 2013 Dan Horák <dan[at]danny.cz> - 5.0.2-3 * Fri Apr 12 2013 Dan Horák <dan[at]danny.cz> - 5.0.2-3
- rebase the lowmem patch - rebase the lowmem patch

18
qtbase-opensource-src-5.0.2-lowmem.patch
View File

@ -1,12 +1,14 @@
diff -up qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp diff -up qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp
--- qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem 2013-04-12 09:13:54.000000000 +0200 --- qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem 2013-04-08 19:11:09.000000000 -0500
+++ qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp 2013-04-12 09:14:01.000000000 +0200 +++ qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp 2013-04-18 19:34:44.600940784 -0500
@@ -45,7 +45,7 @@ @@ -43,8 +43,8 @@
&& (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ >= 440)
// GCC 4.4 supports #pragma GCC optimize and #pragma GCC target
# if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 473) -# if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 473)
// From GCC 4.7.3 onwards, GCC optimize can result in gcc bailing out with OOM -// From GCC 4.7.3 onwards, GCC optimize can result in gcc bailing out with OOM
-# pragma GCC optimize "O3" +# if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 472)
+//# pragma GCC optimize "O3" +// From GCC 4.7.2 onwards, GCC optimize can result in gcc bailing out with OOM
# pragma GCC optimize "O3"
# endif # endif
# if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__)