[med-svn] [Git][med-team/spoa][master] 2 commits: Fix ppc64el FTBFS with altivec and c++ (Closes: #959880)

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / spoa


Commits:
47ccf5b5 by Frédéric Bonnard at 2020-05-06T15:39:40+02:00
Fix ppc64el FTBFS with altivec and c++ (Closes: #959880)

- - - - -
00225fbc by Andreas Tille at 2020-05-07T12:06:28+00:00
Merge branch 'fix-ppc64el' into 'master'

Fix ppc64el FTBFS with altivec and c++ (Closes: #959880)

See merge request med-team/spoa!1
- - - - -


2 changed files:

- + debian/patches/fix-959880.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fix-959880.patch
=====================================
@@ -0,0 +1,25 @@
+Description: Fix FTBFS #959880
+On ppc64el, altivec.h redefines bool, pixel and vector which can collide with
+c++ types.
+This altivec.h inclusion is done with the introduction of simde.
+As altivec.h explains, it's possible to undefine those for C++ compatibility in
+src/simd_alignment_engine.cpp which let it define the variables that other files
+will use while not impacting simde.
+Author: Frédéric Bonnard <frediz at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/simd_alignment_engine.cpp
++++ b/src/simd_alignment_engine.cpp
+@@ -13,6 +13,12 @@
+     #include <simde/x86/avx2.h> // AVX2 and lower
+ }
+ 
++#if defined(__VEC__) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
++#  undef vector
++#  undef pixel
++#  undef bool
++#endif
++
+ #include "spoa/graph.hpp"
+ #include "simd_alignment_engine.hpp"
+ 


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ shared_and_static.patch
 fix_soversion.patch
 simde
 getopt.patch
+fix-959880.patch



View it on GitLab: https://salsa.debian.org/med-team/spoa/-/compare/c4e61ee5a1f1f5ee8a02fba18f0d12a91d309814...00225fbc777e668553991ef46d369b9ab74db52e

-- 
View it on GitLab: https://salsa.debian.org/med-team/spoa/-/compare/c4e61ee5a1f1f5ee8a02fba18f0d12a91d309814...00225fbc777e668553991ef46d369b9ab74db52e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200507/90e95409/attachment-0001.html>