[hamradio-commits] [soundmodem] 01/02: Fix FTBFS on i386 arches: multiple definition of 'mac'

[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 703232d18f0d947b9d927a3f36d09bbb0598d06f
Author: Kamal Mostafa <kamal at whence.com>
Date:   Fri Jul 1 07:23:24 2016 -0700

    Fix FTBFS on i386 arches: multiple definition of 'mac'
---
 .../patches/fix-ftbfs-i386-multiple-def-mac.patch  | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/fix-ftbfs-i386-multiple-def-mac.patch b/debian/patches/fix-ftbfs-i386-multiple-def-mac.patch
new file mode 100644
index 0000000..479964f
--- /dev/null
+++ b/debian/patches/fix-ftbfs-i386-multiple-def-mac.patch
@@ -0,0 +1,25 @@
+Description: Fix FTBFS on i386 arches: multiple definition of `mac'
+Author: Kamal Mostafa <kamal at whence.com>
+
+--- soundmodem-0.20.orig/newqpsk/filter-i386.h
++++ soundmodem-0.20/newqpsk/filter-i386.h
+@@ -1,7 +1,7 @@
+ #ifndef _FILTER_I386_H
+ #define _FILTER_I386_H
+ #define __HAVE_ARCH_MAC
+-extern inline float mac(const float *a, const float *b, unsigned int size)
++static inline float mac(const float *a, const float *b, unsigned int size)
+ {
+ 	float f;
+ 	asm volatile (
+--- soundmodem-0.20.orig/newqpsk/genfilt.c
++++ soundmodem-0.20/newqpsk/genfilt.c
+@@ -18,7 +18,7 @@ int main(int argc, char **argv)
+ 	puts("#define _FILTER_I386_H");
+ 	puts("#define __HAVE_ARCH_MAC");
+ 
+-	puts("extern inline float mac(const float *a, const float *b, unsigned int size)");
++	puts("static inline float mac(const float *a, const float *b, unsigned int size)");
+ 	puts("{");
+ 	puts("\tfloat f;");
+ 	puts("\tasm volatile (");
diff --git a/debian/patches/series b/debian/patches/series
index a3b2cb0..3c42d96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix-gcc5-errors.patch
 add-alsa-m4.patch
 ftbfs-freebsd.patch
 fix-ftbfs-gcc6-matlib-mdet.patch
+fix-ftbfs-i386-multiple-def-mac.patch

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