From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1303603-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AD9B913933E
for <garchives@archives.gentoo.org>; Sat, 17 Jul 2021 22:46:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DD65FE0D9E;
Sat, 17 Jul 2021 22:46:00 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C2FDAE0D9E
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Jul 2021 22:46:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5470033BF05
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Jul 2021 22:45:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A538C581
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Jul 2021 22:45:57 +0000 (UTC)
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" <dlan@gentoo.org>
Message-ID: <1626561921.980dc7e8d6fd082c77650dc05051af0f7e1b8b3a.dlan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
X-VCS-Directories: dev-qt/qtdeclarative/ dev-qt/qtdeclarative/files/
X-VCS-Committer: dlan
X-VCS-Committer-Name: Yixun Lan
X-VCS-Revision: 980dc7e8d6fd082c77650dc05051af0f7e1b8b3a
X-VCS-Branch: master
Date: Sat, 17 Jul 2021 22:45:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: eee0ec76-c945-49c6-abda-859277d3bfd2
X-Archives-Hash: 2ba35136f7a908ddef6e5d74699f7295
commit: 980dc7e8d6fd082c77650dc05051af0f7e1b8b3a
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 15:18:56 2021 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 22:45:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980dc7e8
dev-qt/qtdeclarative: riscv: fix missing atomic library
this will workaroud the error when build in ARCH=riscv,
tested with gcc-11
A likely better fix is to have qtcore detect the need for -latomic
at configure time and, if needed, link to it
Bug: https://bugs.gentoo.org/790689
Closes: https://github.com/gentoo/gentoo/pull/21689
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/qtdeclarative-5.15.2-riscv-atomic.patch | 12 ++++++++++++
dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
new file mode 100644
index 00000000000..a619f3db833
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qml/qml.pro b/src/qml/qml.pro
+index 7d5a92a..01f3b79 100644
+--- a/src/qml/qml.pro
++++ b/src/qml/qml.pro
+@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+
+ # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
+ gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
++gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
+
+ DEFINES += QT_NO_FOREACH
+
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
index ccbde5b669e..6b32fc222cd 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
"${FILESDIR}/${P}-gcc11.patch" # bug 752093
+ "${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689
)
src_prepare() {