[med-svn] [Git][med-team/libhmsbeagle][master] 2 commits: Fix ppc64el FTBFS with altivec (Closes: #922776)

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libhmsbeagle


Commits:
42f7cc23 by Frédéric Bonnard at 2019-05-27T21:10:51Z
Fix ppc64el FTBFS with altivec (Closes: #922776)

Patch to undefine colliding but locally unneeded redefinitions by altivec.

- - - - -
59403e95 by Andreas Tille at 2019-05-27T21:10:51Z
Merge branch 'fix-922776' into 'master'

Fix ppc64el FTBFS with altivec (Closes: #922776)

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


3 changed files:

- debian/control
- + debian/patches/fix-922776.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -45,7 +45,7 @@ Description: High-performance lib for Bayesian and Maximum Likelihood phylogenet
  This package contains development files needed to build against Beagle library.
 
 Package: libhmsbeagle1v5
-Architecture: amd64 i386 arm64 armhf
+Architecture: amd64 i386 arm64 armhf ppc64el
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          beignet-opencl-icd|mesa-opencl-icd|opencl-icd


=====================================
debian/patches/fix-922776.patch
=====================================
@@ -0,0 +1,27 @@
+Description: Fix #922776
+On ppc64el, altivec.h redefines bool, pixel and vector which can collide with
+c++ types.
+This altivec.h inclusion is done by opencl in CL/cl_platform.h .
+As altivec.h explains, it's possible to undefine those for C++ compatibility in
+libhmsbeagle/GPU/GPUInterface.h where we don't need them and where it fails,
+while doing that on the right plateform.
+Finally, enable libhmsbeagle1v5 on ppc64el.
+Author: Frédéric Bonnard <frediz at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: libhmsbeagle/libhmsbeagle/GPU/GPUInterface.h
+===================================================================
+--- libhmsbeagle.orig/libhmsbeagle/GPU/GPUInterface.h
++++ libhmsbeagle/libhmsbeagle/GPU/GPUInterface.h
+@@ -58,6 +58,11 @@
+         #include <OpenCL/opencl.h>
+ #   else
+         #include <CL/opencl.h>
++#       if defined(__VEC__) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
++            #undef vector
++            #undef pixel
++            #undef bool
++#       endif
+ #   endif
+ #   ifdef BEAGLE_XCODE
+         #include "libhmsbeagle/GPU/kernels/BeagleOpenCL_kernels_xcode.h"


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ enable_static.patch
 # disable_cpu_sse_plugin.patch
 gcc-4.7.patch
 doxygen_update.patch
+fix-922776.patch



View it on GitLab: https://salsa.debian.org/med-team/libhmsbeagle/compare/0ffd16f13791a79488bd4ae59cba443e78cd272d...59403e95bd28b68304159c7dda9292fa51ef620a

-- 
View it on GitLab: https://salsa.debian.org/med-team/libhmsbeagle/compare/0ffd16f13791a79488bd4ae59cba443e78cd272d...59403e95bd28b68304159c7dda9292fa51ef620a
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/20190527/c3c0d5a5/attachment-0001.html>