[packages/qt5-qtwebkit] - fix asm on x32
baggins
baggins at pld-linux.org
Thu Mar 5 01:30:07 CET 2015
commit e6db821f0e3b5e6fd397e48cfcc6f93bba8dbe87
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Mar 5 01:29:53 2015 +0100
- fix asm on x32
qt5-qtwebkit.spec | 4 ++++
x32-asm.patch | 11 +++++++++++
2 files changed, 15 insertions(+)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index bc60188..b3b9ed1 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -25,6 +25,7 @@ License: LGPL v2+
Group: X11/Libraries
Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
# Source0-md5: 186627b1ea5b614811fbd0cfa9b4d073
+Patch0: x32-asm.patch
URL: http://qt-project.org/
BuildRequires: OpenGL-devel
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
@@ -162,6 +163,9 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
%prep
%setup -q -n %{orgname}-opensource-src-%{version}
+%ifarch x32
+%patch0 -p1
+%endif
%build
qmake-qt5 \
diff --git a/x32-asm.patch b/x32-asm.patch
new file mode 100644
index 0000000..34a859d
--- /dev/null
+++ b/x32-asm.patch
@@ -0,0 +1,11 @@
+--- qtwebkit-opensource-src-5.3.2+dfsg/Source/WTF/wtf/Atomics.h~ 2014-09-11 12:48:11.000000000 +0200
++++ qtwebkit-opensource-src-5.3.2+dfsg/Source/WTF/wtf/Atomics.h 2015-02-13 22:32:03.647863539 +0100
+@@ -188,7 +188,7 @@
+ #if CPU(X86_64)
+ bool result;
+ asm volatile(
+- "lock; cmpxchgq %3, %2\n\t"
++ "lock; cmpxchg %3, %2\n\t"
+ "sete %1"
+ : "+a"(expected), "=q"(result), "+m"(*location)
+ : "r"(newValue)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/e6db821f0e3b5e6fd397e48cfcc6f93bba8dbe87
More information about the pld-cvs-commit
mailing list