Update aarch64 patchset
This commit is contained in:
parent
2f54342ece
commit
d56c2b8a13
@ -5,11 +5,11 @@ diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo webkit-qtwebkit
|
|||||||
|
|
||||||
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
|
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, powerpc64)|equals(QT_ARCH, powerpc) {
|
+#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")
|
+ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
|
||||||
+ QMAKE_CXXFLAGS_RELEASE -= -g
|
+ QMAKE_CXXFLAGS_RELEASE -= -g
|
||||||
+ QMAKE_CXXFLAGS_RELEASE += -g1
|
+ QMAKE_CXXFLAGS_RELEASE += -g1
|
||||||
+}
|
+#}
|
||||||
+
|
+
|
||||||
QT *= network
|
QT *= network
|
||||||
haveQt(5): QT *= core-private gui-private
|
haveQt(5): QT *= core-private gui-private
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
|
|
||||||
Name: qtwebkit
|
Name: qtwebkit
|
||||||
Summary: Qt WebKit bindings
|
Summary: Qt WebKit bindings
|
||||||
|
|
||||||
Version: 2.3.3
|
Version: 2.3.3
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
|
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
URL: http://trac.webkit.org/wiki/QtWebKit
|
URL: http://trac.webkit.org/wiki/QtWebKit
|
||||||
@ -155,11 +154,17 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
|
|||||||
QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
|
QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
|
||||||
QTDIR=%{_qt4_prefix}; export QTDIR
|
QTDIR=%{_qt4_prefix}; export QTDIR
|
||||||
|
|
||||||
|
%ifarch aarch64
|
||||||
|
%global qtdefines DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
|
||||||
|
%else
|
||||||
|
%global qtdefines
|
||||||
|
%endif
|
||||||
|
|
||||||
mkdir -p %{_target_platform}
|
mkdir -p %{_target_platform}
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
|
WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
|
||||||
../Tools/Scripts/build-webkit \
|
../Tools/Scripts/build-webkit \
|
||||||
--qt \
|
--qt %{?qtdefines} \
|
||||||
--no-webkit2 \
|
--no-webkit2 \
|
||||||
--release \
|
--release \
|
||||||
--qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \
|
--qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \
|
||||||
@ -227,6 +232,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.3-9
|
||||||
|
- Update aarch64 patchset
|
||||||
|
|
||||||
* Fri Feb 28 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-8
|
* Fri Feb 28 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-8
|
||||||
- initial backport aarch64 javascriptcore fixes, needswork (#1070446)
|
- initial backport aarch64 javascriptcore fixes, needswork (#1070446)
|
||||||
- apply downstream patches *after* upstream ones
|
- apply downstream patches *after* upstream ones
|
||||||
|
Loading…
Reference in New Issue
Block a user