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

- fix 64k page issue on ppc/ppc64 

- set -g1 on ppc/ppc64 to reduce archive size
This commit is contained in:
Than Ngo 2013-02-28 12:06:48 +01:00
parent c9ba2bd014
commit 38733a1e38
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qtwebkit-ppc.patch
View File

@ -24,3 +24,26 @@ diff -up webkit-qtwebkit-23/Source/WTF/wtf/PageAllocationAligned.cpp.me webkit-q
// Resererve with suffcient additional VM to correctly align.
size_t reservationSize = size + alignmentDelta;
diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.me webkit-qtwebkit-23/Source/WebCore/WebCore.pri
--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.me 2013-02-27 16:28:34.011342949 +0100
+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-27 16:31:35.961855804 +0100
@@ -7,7 +7,7 @@
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
-equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) {
message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
QMAKE_CXXFLAGS_RELEASE -= -g
QMAKE_CXXFLAGS_RELEASE += -g1
--- webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.system-malloc 2013-02-15 16:46:12.000000000 +0100
+++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h 2013-02-27 14:50:28.044688152 +0100
@@ -1011,7 +1011,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM)
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM)
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */

5
qtwebkit.spec
View File

@ -37,7 +37,7 @@ Patch4: qtwebkit-2.3-save_memory.patch
# don't disable fontconfig on production_build (linking fails)
Patch5: qtwebkit-2.3-fontconfig.patch
# use SYSTEM_MALLOC on ppc/ppc64
# use SYSTEM_MALLOC on ppc/ppc64, -g1 on ppc/ppc64 to reduce archive size
Patch10: qtwebkit-ppc.patch
## upstream patches
@ -114,7 +114,7 @@ QTDIR=%{_qt4_prefix}; export QTDIR
./Tools/Scripts/build-webkit \
--qt \
--qmakearg="CONFIG+=production_build" \
--makeargs=-j1
--makeargs=%{?_smp_mflags}
%install
@ -160,6 +160,7 @@ rm -rf %{buildroot}
%changelog
* Mon Feb 25 2013 Than Ngo <than@redhat.com> - 2.3-0.2.beta2
- fix 64k page issue on ppc/ppc64
- set -g1 on ppc/ppc64 to reduce archive size
* Thu Feb 21 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3-0.1.beta2
- qtwebkit-2.3-beta2