Source: flightgear
Version: 1:2020.3.16+dfsg-1
tags: patch
forwarded: https://sourceforge.net/p/flightgear/flightgear/merge-requests/306/

Hello, changing the atomic int to atomic bool makes the build succeed without 
need of any additional latomic slow linking
in riscv64, resulting in faster runtime code.
I already fowarded upstream.

thanks

G.

diff -Nru flightgear-2020.3.16+dfsg/debian/changelog 
flightgear-2020.3.16+dfsg/debian/changelog
--- flightgear-2020.3.16+dfsg/debian/changelog  2022-10-26 17:51:29.000000000 
+0000
+++ flightgear-2020.3.16+dfsg/debian/changelog  2022-12-10 22:18:14.000000000 
+0000
@@ -1,3 +1,9 @@
+flightgear (1:2020.3.16+dfsg-1.1) unstable; urgency=medium
+
+  * Fix build on riscv64 (Closes: #-1).
+
+ -- Gianfranco Costamagna <[email protected]>  Sat, 10 Dec 2022 
23:18:14 +0100
+
 flightgear (1:2020.3.16+dfsg-1) unstable; urgency=medium
* New upstream version 2020.3.16+dfsg
diff -Nru 
flightgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch 
flightgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch
--- flightgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch     
1970-01-01 00:00:00.000000000 +0000
+++ flightgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch     
2022-12-10 22:18:12.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Don't use atomic_bool, but atomic_int, the latter doesn't need 
external latomic linking
+on riscv64
+Author: Gianfranco Costamagna <[email protected]>
+Origin: https://sourceforge.net/p/flightgear/flightgear/merge-requests/306/
+Last-Update: 2022-12-10
+
+--- flightgear-2020.3.16+dfsg.orig/src/GUI/QQuickDrawable.cxx
++++ flightgear-2020.3.16+dfsg/src/GUI/QQuickDrawable.cxx
+@@ -172,8 +172,8 @@ public:
+     QOpenGLContext* qtContext = nullptr;
+     osg::GraphicsContext* osgContext = nullptr;
+
+-    std::atomic_bool renderControlInited;
+-    std::atomic_bool syncPending;
++    std::atomic_int renderControlInited;
++    std::atomic_int syncPending;
+
+     void frameEvent()
+     {
diff -Nru flightgear-2020.3.16+dfsg/debian/patches/series 
flightgear-2020.3.16+dfsg/debian/patches/series
--- flightgear-2020.3.16+dfsg/debian/patches/series     2022-10-26 
17:50:15.000000000 +0000
+++ flightgear-2020.3.16+dfsg/debian/patches/series     2022-12-10 
22:17:15.000000000 +0000
@@ -9,3 +9,4 @@
 0009-Disable-some-newly-failing-tests.patch
 0010-Ignore-some-more-tests.patch
 0011-test-compilation-fix.patch
+fix-atomic-build-riscv64.patch

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to