[qtwebkit] - fix 64k page issue on ppc/ppc64 - set -g1 on ppc/ppc64 to reduce archive size
Than Ngo
than at fedoraproject.org
Thu Feb 28 11:07:14 UTC 2013
commit 38733a1e38d8f8cf56e643aa40d4e012d098ad8b
Author: Than Ngo <than at redhat.com>
Date: Thu Feb 28 12:06:48 2013 +0100
- fix 64k page issue on ppc/ppc64
- set -g1 on ppc/ppc64 to reduce archive size
qtwebkit-ppc.patch | 23 +++++++++++++++++++++++
qtwebkit.spec | 5 +++--
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/qtwebkit-ppc.patch b/qtwebkit-ppc.patch
index 1a46c51..6eb0a5f 100644
--- a/qtwebkit-ppc.patch
+++ b/qtwebkit-ppc.patch
@@ -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. */
diff --git a/qtwebkit.spec b/qtwebkit.spec
index 93f64f1..b32f133 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -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 at 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 at fedoraproject.org> 2.3-0.1.beta2
- qtwebkit-2.3-beta2
More information about the scm-commits
mailing list