[hamradio-commits] [soundmodem] 01/02: Fix FTBFS with GCC 6: return-statement with a value

[Kamal Mostafa]

This is an automated email from the git hooks/post-receive script.

kamal pushed a commit to branch master
in repository soundmodem.

commit 95ea03b1b81c0bc9cb44c71a27bce9872cae0376
Author: Kamal Mostafa <kamal at whence.com>
Date:   Thu Jun 30 11:05:11 2016 -0700

    Fix FTBFS with GCC 6: return-statement with a value
    
    (Closes #812016)
---
 debian/patches/fix-ftbfs-gcc6-matlib-mdet.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/fix-ftbfs-gcc6-matlib-mdet.patch b/debian/patches/fix-ftbfs-gcc6-matlib-mdet.patch
new file mode 100644
index 0000000..2e5e465
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc6-matlib-mdet.patch
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with GCC 6: return-statement with a value
+Author: Kamal Mostafa <kamal at whence.com>
+Bug-Debian: https://bugs.debian.org/812016
+
+The mdet() function is unused anyway, so just ifdef it out.
+
+--- soundmodem-0.20.orig/matlib/mat.hh
++++ soundmodem-0.20/matlib/mat.hh
+@@ -91,6 +91,7 @@ template<typename T> void mmul(T *c, con
+                 memcpy(c, r, d1 * d3 * sizeof(c[0]));
+ }
+ 
++#if 0
+ template<typename T> void mdet(const T *c, unsigned int d)
+ {
+         T *c2;
+@@ -120,6 +121,7 @@ template<typename T> void mdet(const T *
+         }
+         return det;
+ }
++#endif
+ 
+ /* Transpose a matrix (a el C^{d1 x d2}, b el C^{d2 x d1}) */
+ template<typename T> void mtranspose(T *b, const T *a, unsigned int d1, unsigned int d2)
diff --git a/debian/patches/series b/debian/patches/series
index 82aaf7d..a3b2cb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ drop-unnecessary-libdl-linkage
 fix-gcc5-errors.patch
 add-alsa-m4.patch
 ftbfs-freebsd.patch
+fix-ftbfs-gcc6-matlib-mdet.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soundmodem.git