From: ildumi95 <ileanadumi95@protonmail.com>
Date: Mon, 7 Feb 2022 15:12:46 +0000 (+0100)
Subject: added patch for riscv, updated rules and changelog
X-Git-Tag: archive/raspbian/2.0.45-1+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ecb775758404f0628fbaff5df9780b8b2f0c4504;p=siridb-server.git

added patch for riscv, updated rules and changelog
---

diff --git a/debian/changelog b/debian/changelog
index e567a0d9..64053d65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+siridb-server (2.0.45-1) unstable; urgency=medium
+
+  [ Ileana Dumitrescu ]
+  
+  * New upstream release
+  * Added latomic patch to port for riscv (Closes: #983768)
+
+ -- Ileana Dumitrescu <ileanadumi95@protonmail.com>  Mon, 07 Feb 2022 16:09:39 +0100
+
 siridb-server (2.0.44-1) unstable; urgency=medium
 
   [ Paul Gevers ]
diff --git a/debian/patches/0001-link-with-libatomic-for-test.patch b/debian/patches/0001-link-with-libatomic-for-test.patch
new file mode 100644
index 00000000..affbab47
--- /dev/null
+++ b/debian/patches/0001-link-with-libatomic-for-test.patch
@@ -0,0 +1,32 @@
+From 8e6e9a883121dc8077e2b29b51fe6f399c6d7141 Mon Sep 17 00:00:00 2001
+From: ildumi95 <ileanadumi95@protonmail.com>
+Date: Mon, 7 Feb 2022 15:47:57 +0100
+Subject: [PATCH] link with libatomic for test
+
+---
+ test/test.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test.sh b/test/test.sh
+index 2683a52c..de9bd235 100755
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -25,7 +25,7 @@ run () {
+     OUT=$1.out
+     rm "$OUT" 2> /dev/null
+ 
+-    gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT"
++    gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -latomic -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT"
+     if [[ "$NOMEMTEST" -ne "1" ]]; then
+         valgrind --tool=memcheck --error-exitcode=1 --leak-check=full -q ./$OUT
+     else
+@@ -45,4 +45,4 @@ else
+     run "test_$name"
+ fi
+ 
+-exit $RET
+\ No newline at end of file
++exit $RET
+-- 
+2.30.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..e05f2415
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-link-with-libatomic-for-test.patch
diff --git a/debian/rules b/debian/rules
index 9f385246..ad3e4854 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -latomic
+
 %:
 	dh $@