From owner-svn-ports-all@freebsd.org Tue Nov 8 03:54:31 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E91AC32D91; Tue, 8 Nov 2016 03:54:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B8B035C; Tue, 8 Nov 2016 03:54:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA83sU2P089210; Tue, 8 Nov 2016 03:54:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA83sUoR089208; Tue, 8 Nov 2016 03:54:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611080354.uA83sUoR089208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 8 Nov 2016 03:54:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425677 - in head/math/ceres-solver: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2016 03:54:31 -0000 Author: jbeich Date: Tue Nov 8 03:54:30 2016 New Revision: 425677 URL: https://svnweb.freebsd.org/changeset/ports/425677 Log: math/ceres-solver: unbreak OPENMP=off on 10.0+ i386 In file included from examples/helloworld.cc:36: In file included from include/ceres/ceres.h:37: In file included from include/ceres/autodiff_cost_function.h:132: In file included from include/ceres/internal/autodiff.h:145: include/ceres/jet.h:246:3: error: requested alignment is less than minimum alignment of 4 for type 'Eigen::Matrix' alignas(kAlignment) Eigen::Matrix v; ^ include/ceres/internal/autodiff.h:232:34: note: in instantiation of template class 'ceres::Jet' requested here FixedArray x( ^ include/ceres/autodiff_cost_function.h:211:53: note: in instantiation of member function 'ceres::internal::AutoDiff::Differentiate' requested here N0, N1, N2, N3, N4, N5, N6, N7, N8, N9>::Differentiate( ^ examples/helloworld.cc:70:11: note: in instantiation of member function 'ceres::AutoDiffCostFunction::Evaluate' requested here new AutoDiffCostFunction(new CostFunctor); ^ Tested by: cmp before.o after.o # GCC 4.8 / 6.2 Added: head/math/ceres-solver/files/ head/math/ceres-solver/files/patch-include_ceres_jet.h (contents, props changed) Modified: head/math/ceres-solver/Makefile (contents, props changed) Modified: head/math/ceres-solver/Makefile ============================================================================== --- head/math/ceres-solver/Makefile Tue Nov 8 03:45:22 2016 (r425676) +++ head/math/ceres-solver/Makefile Tue Nov 8 03:54:30 2016 (r425677) @@ -2,7 +2,7 @@ PORTNAME= ceres-solver DISTVERSION= 1.12.0rc1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org Added: head/math/ceres-solver/files/patch-include_ceres_jet.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/ceres-solver/files/patch-include_ceres_jet.h Tue Nov 8 03:54:30 2016 (r425677) @@ -0,0 +1,13 @@ +https://github.com/ceres-solver/ceres-solver/issues/235 + +--- include/ceres/jet.h.orig 2016-10-13 16:52:02 UTC ++++ include/ceres/jet.h +@@ -242,7 +242,7 @@ struct Jet { + 16 <= ::ceres::port_constants::kMaxAlignBytes; + static constexpr int kAlignHint = kShouldAlignMatrix ? + Eigen::AutoAlign : Eigen::DontAlign; +- static constexpr size_t kAlignment = kShouldAlignMatrix ? 16 : 1; ++ static constexpr size_t kAlignment = kShouldAlignMatrix ? 16 : 4; + alignas(kAlignment) Eigen::Matrix v; + #endif + };