diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-11-03 22:48:12 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-11-03 22:48:12 +0000 |
commit | fc66f22b114cdbf026428b11ae7784cd269a2d0a (patch) | |
tree | 7298b8fd0beb6b3c2e8f459c7db14ecc839a8bd0 /science | |
parent | - Remove DOCS Option (diff) |
Add my upstream commit that fixes the build with libc++.
PR: ports/182852
Notes
Notes:
svn path=/head/; revision=332652
Diffstat (limited to 'science')
-rw-r--r-- | science/step/files/patch-git_b0b45d0 | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/science/step/files/patch-git_b0b45d0 b/science/step/files/patch-git_b0b45d0 new file mode 100644 index 000000000000..2c030b5fb9b5 --- /dev/null +++ b/science/step/files/patch-git_b0b45d0 @@ -0,0 +1,50 @@ +commit b0b45d0b871c4cdcd714de29f1d587a26366fbca +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Nov 4 00:07:22 2013 +0200 + + Use Eigen2's newer StdVector implementation if it is available. + + This should fix the build with libc++ (ie. recent versions of FreeBSD and OS + X at least), as Eigen2's default StdVector implementation reimplements + std::vector in an incompatible way. + + Defining EIGEN_USE_NEW_STDVECTOR makes Eigen >= 2.0.6 use the new + implementation that does not have these problems and is the default in + Eigen3. + +diff --git a/stepcore/collisionsolver.cc b/stepcore/collisionsolver.cc +index a5d2f90..9a263a8 100644 +--- stepcore/collisionsolver.cc ++++ stepcore/collisionsolver.cc +@@ -23,6 +23,7 @@ + #include <algorithm> + #include <QtGlobal> + ++#define EIGEN_USE_NEW_STDVECTOR + #include <Eigen/StdVector> + + namespace StepCore { +diff --git a/stepcore/collisionsolver.h b/stepcore/collisionsolver.h +index c136d9a..d67d1d0 100644 +--- stepcore/collisionsolver.h ++++ stepcore/collisionsolver.h +@@ -28,6 +28,7 @@ + #include "vector.h" + #include "solver.h" + ++#define EIGEN_USE_NEW_STDVECTOR + #include <Eigen/StdVector> + + namespace StepCore +diff --git a/stepcore/types.h b/stepcore/types.h +index 05dbd9d..b1259a6 100644 +--- stepcore/types.h ++++ stepcore/types.h +@@ -25,6 +25,7 @@ + + #include "object.h" + #include "vector.h" ++#define EIGEN_USE_NEW_STDVECTOR + #include <Eigen/StdVector> + #include <QByteArray> + #include <Eigen/Sparse> |