[dune-geometry] 01/02: Add patches for build failures on powerpc, ppc64, s390x, mips and sparc.

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to annotated tag debian/2.3.20131228g31cd66f-2
in repository dune-geometry.

commit e6e755fb42bf61d34bb30d814a5c557e747d4a32
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Jan 4 00:20:58 2014 +0100

    Add patches for build failures on powerpc, ppc64, s390x, mips and sparc.
---
 ...1-Fix-alignment-of-mappingStorage_-member.patch | 21 ++++++++++
 ...se-epsilon-for-floating-point-comparisons.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 69 insertions(+)

diff --git a/debian/patches/0001-Fix-alignment-of-mappingStorage_-member.patch b/debian/patches/0001-Fix-alignment-of-mappingStorage_-member.patch
new file mode 100644
index 0000000..ca43064
--- /dev/null
+++ b/debian/patches/0001-Fix-alignment-of-mappingStorage_-member.patch
@@ -0,0 +1,21 @@
+From 52b2e6fa6f97f2d3c4d7a1c7047f3e48e9e8a34d Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Fri, 3 Jan 2014 14:17:12 +0100
+Subject: [PATCH] Fix alignment of mappingStorage_ member.
+Forwarded: https://dune-project.org/flyspray/index.php?do=details&task_id=1406
+
+---
+ dune/geometry/genericgeometry/geometry.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/dune/geometry/genericgeometry/geometry.hh
++++ b/dune/geometry/genericgeometry/geometry.hh
+@@ -471,7 +471,7 @@
+        * We don't know its type, but we don't want to do classical
+        * dynamic polymorphism, because heap allocation is expensive.
+        */
+-      char mappingStorage_[ MappingFactory::maxMappingSize ];
++      char mappingStorage_[ MappingFactory::maxMappingSize ] __attribute__((aligned(sizeof(double))));
+     };
+ 
+ 
diff --git a/debian/patches/0001-Increase-epsilon-for-floating-point-comparisons.patch b/debian/patches/0001-Increase-epsilon-for-floating-point-comparisons.patch
new file mode 100644
index 0000000..9940589
--- /dev/null
+++ b/debian/patches/0001-Increase-epsilon-for-floating-point-comparisons.patch
@@ -0,0 +1,46 @@
+From 1163918204b52af5a1700d030065e608e6572e03 Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Fri, 3 Jan 2014 12:15:02 +0100
+Subject: [PATCH] Increase epsilon for floating point comparisons
+Forwarded: https://dune-project.org/flyspray/index.php?do=details&task_id=1405
+
+This fixes the build failure on powerpc[1] and hopefully also on
+s390x[2] and ppc64[3].
+
+  [1] <https://buildd.debian.org/status/fetch.php?pkg=dune-geometry&arch=powerpc&ver=2.3~20131228g31cd66f-1&stamp=1388710028>
+  [2] <https://buildd.debian.org/status/fetch.php?pkg=dune-geometry&arch=s390x&ver=2.3~20131228g31cd66f-1&stamp=1388709946>
+  [3] <http://buildd.debian-ports.org/status/fetch.php?pkg=dune-geometry&arch=ppc64&ver=2.3~20131228g31cd66f-1&stamp=1388730277>
+---
+ dune/geometry/test/test-affinegeometry.cc      | 2 +-
+ dune/geometry/test/test-multilineargeometry.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dune/geometry/test/test-affinegeometry.cc b/dune/geometry/test/test-affinegeometry.cc
+index 2fb5d27..9b3becd 100644
+--- a/dune/geometry/test/test-affinegeometry.cc
++++ b/dune/geometry/test/test-affinegeometry.cc
+@@ -42,7 +42,7 @@ static bool testAffineGeometry ( const Dune::ReferenceElement< ctype, mydim > &r
+   typedef Dune::AffineGeometry< ctype, mydim, cdim > Geometry;
+ 
+   const Dune::FieldVector< ctype, mydim > &localCenter = refElement.position( 0, 0 );
+-  const ctype epsilon = ctype( 256 )*std::numeric_limits< ctype >::epsilon();
++  const ctype epsilon = ctype( 32768 )*std::numeric_limits< ctype >::epsilon();
+ 
+   const ctype detA = A.determinant();
+   assert( std::abs( std::abs( B.determinant() ) - ctype( 1 ) ) <= epsilon );
+diff --git a/dune/geometry/test/test-multilineargeometry.cc b/dune/geometry/test/test-multilineargeometry.cc
+index a68dbd6..39e8aee 100644
+--- a/dune/geometry/test/test-multilineargeometry.cc
++++ b/dune/geometry/test/test-multilineargeometry.cc
+@@ -42,7 +42,7 @@ static bool testMultiLinearGeometry ( const Dune::ReferenceElement< ctype, mydim
+   typedef Dune::MultiLinearGeometry< ctype, mydim, cdim > Geometry;
+ 
+   const Dune::FieldVector< ctype, mydim > &localCenter = refElement.position( 0, 0 );
+-  const ctype epsilon = ctype( 256 )*std::numeric_limits< ctype >::epsilon();
++  const ctype epsilon = ctype( 32768 )*std::numeric_limits< ctype >::epsilon();
+ 
+   const ctype detA = A.determinant();
+   assert( std::abs( std::abs( B.determinant() ) - ctype( 1 ) ) <= epsilon );
+-- 
+1.8.5.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 574d575..4af8b15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 soname.patch
 svn-version.patch
+0001-Increase-epsilon-for-floating-point-comparisons.patch
+0001-Fix-alignment-of-mappingStorage_-member.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-geometry.git