Bug#868156: patch for FTBFS on ppc64el proposal

[Frédéric Bonnard]

Source: dhewm3
Source-Version: 1.4.1+dfsg-1
Tags: patch
User: debian-powerpc at lists.debian.org
Usertags: ppc64el 

--

Hi,
there is a build failure on ppc64el due to the fact that the code
enabling altivec specific parts makes confusion between MacOS and
Altivec existence.

https://buildd.debian.org/status/fetch.php?pkg=dhewm3&arch=ppc64el&ver=1.4.1%2Bdfsg-1&stamp=1485535734&raw=0

Thus the SIMD code uses ppc_intrinsic.h api which
is not available in gcc on Linux.
I added some ifdef to detect MacOS and skip that code.
Here is a debdiff in attachment.

F.
-------------- next part --------------
diff -Nru dhewm3-1.4.1+dfsg/debian/patches/ppc64el-build.patch dhewm3-1.4.1+dfsg/debian/patches/ppc64el-build.patch
--- dhewm3-1.4.1+dfsg/debian/patches/ppc64el-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ dhewm3-1.4.1+dfsg/debian/patches/ppc64el-build.patch	2016-07-07 23:10:09.000000000 +0000
@@ -0,0 +1,36 @@
+Description: Fix build on ppc64el
+Build failure on ppc64el is due to the fact that the code
+enabling altivec specific parts makes confusion between MacOS and
+Altivec existence.
+Thus the SIMD code uses MacOS ppc_intrinsic.h api which
+is not available in gcc on Linux.
+
+Author: <frediz at linux.vnet.ibm.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: dhewm3-1.4.1+dfsg/neo/idlib/math/Simd_AltiVec.cpp
+===================================================================
+--- dhewm3-1.4.1+dfsg.orig/neo/idlib/math/Simd_AltiVec.cpp	2017-07-12 12:34:33.000000000 +0000
++++ dhewm3-1.4.1+dfsg/neo/idlib/math/Simd_AltiVec.cpp	2017-07-12 12:43:51.863029647 +0000
+@@ -45,7 +45,7 @@
+ //
+ //===============================================================
+ 
+-#if defined(__GNUC__) && defined(__ALTIVEC__)
++#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
+ 
+ #ifdef PPC_INTRINSICS
+ 	// for square root estimate instruction
+Index: dhewm3-1.4.1+dfsg/neo/idlib/math/Simd_AltiVec.h
+===================================================================
+--- dhewm3-1.4.1+dfsg.orig/neo/idlib/math/Simd_AltiVec.h	2017-07-12 12:34:33.000000000 +0000
++++ dhewm3-1.4.1+dfsg/neo/idlib/math/Simd_AltiVec.h	2017-07-12 12:38:38.083750262 +0000
+@@ -110,7 +110,7 @@
+ //#define DRAWVERT_PADDED
+ 
+ class idSIMD_AltiVec : public idSIMD_Generic {
+-#if defined(__GNUC__) && defined(__ALTIVEC__)
++#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
+ public:
+ 
+ 	virtual const char * VPCALL GetName( void ) const;
diff -Nru dhewm3-1.4.1+dfsg/debian/patches/series dhewm3-1.4.1+dfsg/debian/patches/series
--- dhewm3-1.4.1+dfsg/debian/patches/series	2015-10-05 17:56:17.000000000 +0000
+++ dhewm3-1.4.1+dfsg/debian/patches/series	2016-07-07 23:10:09.000000000 +0000
@@ -1 +1,2 @@
 01-changedatadir.patch
+ppc64el-build.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-games-devel/attachments/20170712/70b395ce/attachment.sig>