Date: Wed, 8 Aug 2018 12:32:03 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476641 - in head/math/cadabra2: . files Message-ID: <201808081232.w78CW3Ko047348@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Aug 8 12:32:03 2018 New Revision: 476641 URL: https://svnweb.freebsd.org/changeset/ports/476641 Log: math/cadabra2: unbreak with libc++ 7 In file included from core/PythonCdb.cc:25: In file included from libs/pybind11/include/pybind11/stl.h:34: /usr/include/c++/v1/experimental/optional:11:2: error: "<experimental/optional> has been removed. Use <optional> instead." PR: 230355 Obtained from: upstream (pybind11) Added: head/math/cadabra2/files/patch-pybind11-libc++7 (contents, props changed) Modified: head/math/cadabra2/Makefile (contents, props changed) Modified: head/math/cadabra2/Makefile ============================================================================== --- head/math/cadabra2/Makefile Wed Aug 8 12:31:40 2018 (r476640) +++ head/math/cadabra2/Makefile Wed Aug 8 12:32:03 2018 (r476641) @@ -2,7 +2,7 @@ PORTNAME= cadabra2 DISTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ Added: head/math/cadabra2/files/patch-pybind11-libc++7 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cadabra2/files/patch-pybind11-libc++7 Wed Aug 8 12:32:03 2018 (r476641) @@ -0,0 +1,26 @@ +https://github.com/pybind/pybind11/commit/ff6bd092d482b0c4e51aeb7367c3e5ecbc18a9de + +--- libs/pybind11/include/pybind11/cast.h.orig 2018-03-30 09:33:27 UTC ++++ libs/pybind11/include/pybind11/cast.h +@@ -1685,6 +1685,9 @@ template <> inline void cast_safe<void>(object &&) {} + + NAMESPACE_END(detail) + ++template <return_value_policy policy = return_value_policy::automatic_reference> ++tuple make_tuple() { return tuple(0); } ++ + template <return_value_policy policy = return_value_policy::automatic_reference, + typename... Args> tuple make_tuple(Args&&... args_) { + constexpr size_t size = sizeof...(Args); +--- libs/pybind11/include/pybind11/stl.h.orig 2018-03-30 09:33:27 UTC ++++ libs/pybind11/include/pybind11/stl.h +@@ -30,7 +30,8 @@ + # define PYBIND11_HAS_OPTIONAL 1 + # endif + // std::experimental::optional (but not allowed in c++11 mode) +-# if defined(PYBIND11_CPP14) && __has_include(<experimental/optional>) ++# if defined(PYBIND11_CPP14) && (__has_include(<experimental/optional>) && \ ++ !__has_include(<optional>)) + # include <experimental/optional> + # define PYBIND11_HAS_EXP_OPTIONAL 1 + # endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808081232.w78CW3Ko047348>