Commit a411d6b2 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[optimization/roboptim-trajectory] Fix build on multiple distributions

* patch-aa: Use boost::none instead of the default none_t() constructor, which
  has disappeared in recent boost versions.
* Fix dependencies: add eigen3, libtool-ltdl and a bunch of boost-libs

Bump PKGREVISION
parent 7c307c69
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Created: florent on Sat, 9 May 2009 # Created: florent on Sat, 9 May 2009
# #
PKGREVISION= 1
VERSION= 3.1 VERSION= 3.1
PACKAGE= roboptim-trajectory PACKAGE= roboptim-trajectory
DISTNAME= ${PACKAGE}-${VERSION} DISTNAME= ${PACKAGE}-${VERSION}
...@@ -17,18 +18,28 @@ MAINTAINER= roboptim@googlegroups.com ...@@ -17,18 +18,28 @@ MAINTAINER= roboptim@googlegroups.com
DYNAMIC_PLIST_DIRS+= share/doc/roboptim-trajectory DYNAMIC_PLIST_DIRS+= share/doc/roboptim-trajectory
# disable -Werror because of boost + gcc that don't cohabit well depending on # disable -Werror, otherwise this does not build
# their respective versions
CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes
INCLUDE_DIRS.boost-headers=include # cmake cannot find those alone:
INCLUDE_DIRS.libtool-ltdl= include
LIBRARY_DIRS.libtool-ltdl= lib
RPATHS_DIRS.libtool-ltdl= lib
USE_BOOST_LIBS= filesystem system thread program_options serialization
USE_BOOST_LIBS+= unit_test_framework
DEPEND_ABI.eigen3+= eigen3>=3.2.0
include ../../devel/boost-headers/depend.mk include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../math/eigen3/depend.mk
include ../../optimization/roboptim-core/depend.mk include ../../optimization/roboptim-core/depend.mk
include ../../pkgtools/pkg-config/depend.mk include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/latex.mk include ../../mk/sysdep/latex.mk
include ../../mk/sysdep/libtool-ltdl.mk
include ../../mk/language/c.mk include ../../mk/language/c.mk
include ../../mk/language/c++.mk include ../../mk/language/c++.mk
include ../../mk/robotpkg.mk include ../../mk/robotpkg.mk
SHA1 (roboptim-trajectory-3.1.tar.gz) = 807e5f5c4a2cdeb9fa3284a56ffcd9b15aa5b29c SHA1 (roboptim-trajectory-3.1.tar.gz) = 807e5f5c4a2cdeb9fa3284a56ffcd9b15aa5b29c
RMD160 (roboptim-trajectory-3.1.tar.gz) = d9a4e2e5a042d19d94f51c1eab96dba05317e29b RMD160 (roboptim-trajectory-3.1.tar.gz) = d9a4e2e5a042d19d94f51c1eab96dba05317e29b
Size (roboptim-trajectory-3.1.tar.gz) = 419459 bytes Size (roboptim-trajectory-3.1.tar.gz) = 419459 bytes
SHA1 (patch-aa) = 8c69fe1b3c6621cc2583e21ff9c6579cf2bf9252
Use boost::none instead of the default none_t() constructor, which has
disappeared in recent boost versions.
--- include/roboptim/trajectory/spline-length.hh~ 2015-06-27 08:50:04.000000000 +0200
+++ include/roboptim/trajectory/spline-length.hh 2018-04-09 11:42:29.065744689 +0200
@@ -53,7 +53,7 @@
/// \param nDiscretizationPoints number of discretization points
SplineLength (const CubicBSpline& spline,
const size_type nDiscretizationPoints = 100,
- boost::optional<interval_t> interval = boost::none_t ());
+ boost::optional<interval_t> interval = boost::none);
virtual ~SplineLength ();
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment