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

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 simgear-2020.3.16+dfsg/debian/changelog 
simgear-2020.3.16+dfsg/debian/changelog
--- simgear-2020.3.16+dfsg/debian/changelog     2022-10-26 08:53:00.000000000 
+0000
+++ simgear-2020.3.16+dfsg/debian/changelog     2022-12-10 22:27:56.000000000 
+0000
@@ -1,3 +1,9 @@
+simgear (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:27:56 +0100
+
 simgear (1:2020.3.16+dfsg-1) unstable; urgency=medium
* New upstream version 2020.3.16+dfsg
diff -Nru simgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch 
simgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch
--- simgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch        
1970-01-01 00:00:00.000000000 +0000
+++ simgear-2020.3.16+dfsg/debian/patches/fix-atomic-build-riscv64.patch        
2022-12-10 22:27:54.000000000 +0000
@@ -0,0 +1,23 @@
+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/simgear/merge-requests/119/
+Last-Update: 2022-12-10
+
+--- simgear-2020.3.16+dfsg.orig/simgear/threads/SGThread.hxx
++++ simgear-2020.3.16+dfsg/simgear/threads/SGThread.hxx
+@@ -171,10 +171,10 @@ private:
+     bool _terminated;
+     int last_await_time;
+
+-    std::atomic<bool> dataReady;
+-    std::atomic<bool> complete;
+-    std::atomic<bool> process_ran;
+-    std::atomic<bool> process_running;
++    std::atomic<int> dataReady;
++    std::atomic<int> complete;
++    std::atomic<int> process_ran;
++    std::atomic<int> process_running;
+
+ public:
+     SGExclusiveThread();
diff -Nru simgear-2020.3.16+dfsg/debian/patches/series 
simgear-2020.3.16+dfsg/debian/patches/series
--- simgear-2020.3.16+dfsg/debian/patches/series        2022-10-24 
11:25:38.000000000 +0000
+++ simgear-2020.3.16+dfsg/debian/patches/series        2022-12-10 
22:27:44.000000000 +0000
@@ -5,3 +5,4 @@
 disable_network_tests.patch
 spelling_fixes.patch
 fix-ftbfs-on-armel-armhf.patch
+fix-atomic-build-riscv64.patch

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to