From owner-svn-ports-head@FreeBSD.ORG Sun Nov 3 22:48:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDE03550; Sun, 3 Nov 2013 22:48:12 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF51B27DA; Sun, 3 Nov 2013 22:48:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3MmCps077997; Sun, 3 Nov 2013 22:48:12 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3MmC4t077996; Sun, 3 Nov 2013 22:48:12 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201311032248.rA3MmC4t077996@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 3 Nov 2013 22:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332652 - head/science/step/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 22:48:12 -0000 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 +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 + #include + ++#define EIGEN_USE_NEW_STDVECTOR + #include + + 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 + + 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 + #include + #include