Date: Sun, 3 Nov 2013 22:48:12 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332652 - head/science/step/files Message-ID: <201311032248.rA3MmC4t077996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sun Nov 3 22:48:12 2013 New Revision: 332652 URL: http://svnweb.freebsd.org/changeset/ports/332652 Log: Add my upstream commit that fixes the build with libc++. PR: ports/182852 Added: head/science/step/files/ head/science/step/files/patch-git_b0b45d0 (contents, props changed) Added: head/science/step/files/patch-git_b0b45d0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/step/files/patch-git_b0b45d0 Sun Nov 3 22:48:12 2013 (r332652) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311032248.rA3MmC4t077996>