[SCM] drumgizmo/master: Ensure libatomic test checks for large integers

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Mon Nov 7 17:22:02 UTC 2016


The following commit has been merged in the master branch:
commit e20887aae3e630513c2b7877ddac40a63a7c93fe
Author: Radovan Birdic <Radovan.Birdic at imgtec.com>
Date:   Mon Nov 7 15:04:36 2016 +0000

    Ensure libatomic test checks for large integers
    
    Closes: #843136

diff --git a/debian/patches/mips-atomic.patch b/debian/patches/mips-atomic.patch
new file mode 100644
index 0000000..b0ed5eb
--- /dev/null
+++ b/debian/patches/mips-atomic.patch
@@ -0,0 +1,24 @@
+Description: Ensure libatomic test checks for large integers
+ On 32-bit MIPS (and possibly other) systems, 64-bit atomics are not available
+ but 32-bit atomics are. This defeats the test in configure.ac which only checks
+ if 'int' can be used with atomics. The patch adjusts the test so that libatomic
+ is used if any integer cannot support atomics without it.
+Author: Radovan Birdic <Radovan.Birdic at imgtec.com>
+Bug-Debian: https://bugs.debian.org/843136
+Reviewed-by: James Cowgill <jcowgill at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
+@@ -473,9 +473,10 @@ dnl ======================
+ AC_MSG_CHECKING([for the need for linkage with libatomic])
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE([AC_LANG_SOURCE[
++      #include <cstdint>
+       #include <atomic>
+       int main() {
+-        struct Test { int val; };
++        struct Test { std::uintmax_t val; };
+         std::atomic<Test> s;
+         return s.is_lock_free()?1:0;
+       }
diff --git a/debian/patches/series b/debian/patches/series
index e027257..1d06b6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 alsa-kFreeBSD.patch
+mips-atomic.patch

-- 
drumgizmo packaging



More information about the pkg-multimedia-commits mailing list