summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-10-20 03:35:27 +0200
committerDavide Pesavento <pesa@gentoo.org>2015-10-20 03:35:27 +0200
commitb13815a11545ddf9d5ef1db942ad7aea1d8c58c3 (patch)
tree84ef355aad0a778fd5daa09de2d7d1c2718fa60f /dev-qt
parentdev-python/sip: minor simplifications (diff)
downloadgentoo-b13815a11545ddf9d5ef1db942ad7aea1d8c58c3.tar.gz
gentoo-b13815a11545ddf9d5ef1db942ad7aea1d8c58c3.tar.bz2
gentoo-b13815a11545ddf9d5ef1db942ad7aea1d8c58c3.zip
dev-qt/qtcore: fix build on ia64
Gentoo-Bug: 559802 Package-Manager: portage-2.2.23
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch45
-rw-r--r--dev-qt/qtcore/qtcore-5.5.1.ebuild4
2 files changed, 49 insertions, 0 deletions
diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch b/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch
new file mode 100644
index 00000000000..c45fd91abc0
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch
@@ -0,0 +1,45 @@
+From deb6b5032c8eed35021b3c697a770645d90b11ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89meric=20MASCHINO?= <emeric.maschino@gmail.com>
+Date: Wed, 9 Sep 2015 22:56:32 +0200
+Subject: [PATCH] Fixed compilation errors in qatomic_ia64.h
+
+QBasicAtomicOps<size>::testAndSetRelaxed(T &, T, T) and
+QBasicAtomicOps<size>::testAndSetOrdered(T &, T, T) bodies don't match
+any prototypes in qatomic_ia64.h: the optional parameter T *currentValue
+is missing.
+
+Task-number: QTBUG-48197
+Change-Id: I0112c429b161b4a0ddb6e8a0400a436282ffb1c7
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/arch/qatomic_ia64.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h
+index c880e85..2ba6d12 100644
+--- a/src/corelib/arch/qatomic_ia64.h
++++ b/src/corelib/arch/qatomic_ia64.h
+@@ -1035,16 +1035,16 @@ bool QBasicAtomicOps<size>::deref(T &_q_value) Q_DECL_NOTHROW
+ }
+
+ template<int size> template <typename T> inline
+-bool QBasicAtomicOps<size>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
++bool QBasicAtomicOps<size>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+ {
+- return testAndSetAcquire(_q_value, expectedValue, newValue);
++ return testAndSetAcquire(_q_value, expectedValue, newValue, currentValue);
+ }
+
+ template<int size> template <typename T> inline
+-bool QBasicAtomicOps<size>::testAndSetOrdered(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
++bool QBasicAtomicOps<size>::testAndSetOrdered(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+ {
+ orderedMemoryFence(_q_value);
+- return testAndSetAcquire(_q_value, expectedValue, newValue);
++ return testAndSetAcquire(_q_value, expectedValue, newValue, currentValue);
+ }
+
+ template<int size> template <typename T> inline
+--
+2.6.2
+
diff --git a/dev-qt/qtcore/qtcore-5.5.1.ebuild b/dev-qt/qtcore/qtcore-5.5.1.ebuild
index 6ba815b7a46..9f424843a64 100644
--- a/dev-qt/qtcore/qtcore-5.5.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.5.1.ebuild
@@ -24,6 +24,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-qatomic_ia64.h.patch" # bug 559802
+)
+
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc