On 20-12-15 17:41, Sebastiaan Couwenberg wrote:
> The gnuais upload happened quickly, but unfortunately it FTBFS on i386
> [0] as can been seen in the transition tracker [1]. The build fails at
> the linking stage:
> 
>  CMakeFiles/gnuais.dir/filter.c.o: In function `__mac_g':
> /build/gnuais-0.3.3/src/filter-i386.h:37: multiple definition of `__mac_g'
>  CMakeFiles/gnuais.dir/receiver.c.o:/build/gnuais-0.3.3/src/filter-i386.h:37: 
> first defined here
>  CMakeFiles/gnuais.dir/filter.c.o: In function `__mac_c':
> /build/gnuais-0.3.3/src/filter-i386.h:48: multiple definition of `__mac_c'
>  CMakeFiles/gnuais.dir/receiver.c.o:/build/gnuais-0.3.3/src/filter-i386.h:48: 
> first defined here
> 
> This i386 specific header may not be required anymore.

To work around this issue, the changes in the attached debdiff were used
to make the build succeed on i386.

I'm not entirely sure of the proper upstream fix.

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1
diff -Nru gnuais-0.3.3/debian/changelog gnuais-0.3.3/debian/changelog
--- gnuais-0.3.3/debian/changelog       2015-12-19 22:04:28.000000000 +0100
+++ gnuais-0.3.3/debian/changelog       2015-12-20 17:43:35.000000000 +0100
@@ -1,3 +1,10 @@
+gnuais (0.3.3-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't include filter-i386.h on i386 to prevent multiple definition issues.
+
+ -- Bas Couwenberg <[email protected]>  Sun, 20 Dec 2015 17:42:46 +0100
+
 gnuais (0.3.3-4) unstable; urgency=medium
 
   * Fixed build-dependency (Closes: #808091)
diff -Nru gnuais-0.3.3/debian/rules gnuais-0.3.3/debian/rules
--- gnuais-0.3.3/debian/rules   2015-12-19 22:00:49.000000000 +0100
+++ gnuais-0.3.3/debian/rules   2015-12-20 17:42:41.000000000 +0100
@@ -2,10 +2,15 @@
 
 #export DH_VERBOSE=1
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),"i386"))
+       export DEB_CFLAGS_MAINT_APPEND = -D_FILTER_I386_H
+endif
+
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
        dh  $@
-

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to