[neon/qt/qt3d/Neon/testing] debian: Add a patch to link the openglrenderer plugin with -latomic on riscv64.

Dmitry Shachnev null at kde.org
Tue May 18 14:56:07 BST 2021


Git commit 652354660d07b671541969f5bf63d20232eb41ed by Dmitry Shachnev.
Committed on 30/10/2020 at 18:00.
Pushed by sitter into branch 'Neon/testing'.

Add a patch to link the openglrenderer plugin with -latomic on riscv64.

M  +1    -0    debian/changelog
A  +16   -0    debian/patches/riscv64_atomic.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qt3d/commit/652354660d07b671541969f5bf63d20232eb41ed

diff --git a/debian/changelog b/debian/changelog
index 03924ed..a1d916a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qt3d-opensource-src (5.15.1+dfsg-3) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add a patch to disable tst_qtext2dentity::checkChangeArbiter() test on
     all OpenGL ES 2 environments, not just ANGLE (closes: #973440).
+  * Add a patch to link the openglrenderer plugin with -latomic on riscv64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 30 Oct 2020 20:42:22 +0300
 
diff --git a/debian/patches/riscv64_atomic.diff b/debian/patches/riscv64_atomic.diff
new file mode 100644
index 0000000..0a08f6d
--- /dev/null
+++ b/debian/patches/riscv64_atomic.diff
@@ -0,0 +1,16 @@
+Description: link the openglrenderer plugin with -latomic on riscv64
+ Otherwise it fails to build with the following error:
+ /usr/bin/ld: .obj/renderview.o: in function `QHash<int, Qt3DRender::Render::OpenGL::RenderView::StandardUniform>::findNode(int const&, unsigned int) const':
+ /usr/include/riscv64-linux-gnu/qt5/QtCore/qhash.h:931: undefined reference to `__atomic_exchange_1'
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2020-10-30
+
+--- a/src/plugins/renderers/opengl/opengl.pri
++++ b/src/plugins/renderers/opengl/opengl.pri
+@@ -39,3 +39,5 @@ qtConfig(qt3d-simd-sse2):!qtConfig(qt3d-
+     CONFIG += simd
+     QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2
+ }
++
++isEqual(QT_ARCH, "riscv64"): QMAKE_LIBS += -latomic
diff --git a/debian/patches/series b/debian/patches/series
index b7abf8c..e4db8e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 tst_qtext2dentity_gles_disable.diff
+riscv64_atomic.diff



More information about the Neon-commits mailing list