[Midnightbsd-cvs] mports [21512] trunk/devel/boost-libs: fix build on 0.8 and current
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 5 19:41:12 EDT 2016
Revision: 21512
http://svnweb.midnightbsd.org/mports/?rev=21512
Author: laffer1
Date: 2016-08-05 19:41:12 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
fix build on 0.8 and current
Modified Paths:
--------------
trunk/devel/boost-libs/Makefile
trunk/devel/boost-libs/files/patch-boost__archive__iterators__transorm_width.hpp
Added Paths:
-----------
trunk/devel/boost-libs/files/patch-168e60aa3d5238cd25b341661a6c53e638dd6c33-plusclang
trunk/devel/boost-libs/files/patch-5a9688e4ef22c51f77bf147589e3306bf8fd03df
trunk/devel/boost-libs/files/patch-7d1bf7680301331073761e81b85989b9ecee56d5
trunk/devel/boost-libs/files/patch-a6b17d900155d2a04f54ad18fd89197001f231ab
trunk/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f
trunk/devel/boost-libs/files/patch-boost_static__assert.hpp
trunk/devel/boost-libs/files/patch-f9b3dcb203f29dff4b264d2430f7dca9ebd43ea6
Modified: trunk/devel/boost-libs/Makefile
===================================================================
--- trunk/devel/boost-libs/Makefile 2016-08-05 23:37:38 UTC (rev 21511)
+++ trunk/devel/boost-libs/Makefile 2016-08-05 23:41:12 UTC (rev 21512)
@@ -3,7 +3,7 @@
PORTNAME= boost-libs
PORTVERSION= 1.55.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/boost/boost/${PORTVERSION}
PORTVERSUFFIX= ${PORTVERSION:C/\.[0-9]+$//}
@@ -16,7 +16,7 @@
CONFLICTS+= boost-python-1* boost-1*
-USES+= tar:bzip2
+USES+= tar:bzip2 compiler:gcc-c++11-lib
BUILD_DEPENDS+= bjam:${PORTSDIR}/devel/boost-jam
Added: trunk/devel/boost-libs/files/patch-168e60aa3d5238cd25b341661a6c53e638dd6c33-plusclang
===================================================================
--- trunk/devel/boost-libs/files/patch-168e60aa3d5238cd25b341661a6c53e638dd6c33-plusclang (rev 0)
+++ trunk/devel/boost-libs/files/patch-168e60aa3d5238cd25b341661a6c53e638dd6c33-plusclang 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,23 @@
+--- boost/concept/detail/general.hpp.orig 2010-06-08 19:31:13 UTC
++++ boost/concept/detail/general.hpp
+@@ -65,10 +65,19 @@ struct requirement_<void(*)(Model)>
+
+ # endif
+
++// Version check from https://svn.boost.org/trac/boost/changeset/82886
++// (boost/static_assert.hpp)
++#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) || defined(__clang__)
++#define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused))
++#else
++#define BOOST_CONCEPT_UNUSED_TYPEDEF /**/
++#endif
++
+ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
+ typedef ::boost::concepts::detail::instantiate< \
+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \
+- BOOST_PP_CAT(boost_concept_check,__LINE__)
++ BOOST_PP_CAT(boost_concept_check,__LINE__) \
++ BOOST_CONCEPT_UNUSED_TYPEDEF
+
+ }}
+
Property changes on: trunk/devel/boost-libs/files/patch-168e60aa3d5238cd25b341661a6c53e638dd6c33-plusclang
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/boost-libs/files/patch-5a9688e4ef22c51f77bf147589e3306bf8fd03df
===================================================================
--- trunk/devel/boost-libs/files/patch-5a9688e4ef22c51f77bf147589e3306bf8fd03df (rev 0)
+++ trunk/devel/boost-libs/files/patch-5a9688e4ef22c51f77bf147589e3306bf8fd03df 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,38 @@
+--- boost/math/special_functions/fpclassify.hpp.orig 2013-09-28 16:19:47 UTC
++++ boost/math/special_functions/fpclassify.hpp
+@@ -348,7 +348,7 @@ inline bool (isfinite)(long double x)
+ { //!< \brief return true if floating-point type t is finite.
+ typedef detail::fp_traits<long double>::type traits;
+ typedef traits::method method;
+- typedef boost::is_floating_point<long double>::type fp_tag;
++ //typedef boost::is_floating_point<long double>::type fp_tag;
+ typedef long double value_type;
+ return detail::isfinite_impl(static_cast<value_type>(x), method());
+ }
+@@ -419,7 +419,7 @@ inline bool (isnormal)(long double x)
+ {
+ typedef detail::fp_traits<long double>::type traits;
+ typedef traits::method method;
+- typedef boost::is_floating_point<long double>::type fp_tag;
++ //typedef boost::is_floating_point<long double>::type fp_tag;
+ typedef long double value_type;
+ return detail::isnormal_impl(static_cast<value_type>(x), method());
+ }
+@@ -508,7 +508,7 @@ inline bool (isinf)(long double x)
+ {
+ typedef detail::fp_traits<long double>::type traits;
+ typedef traits::method method;
+- typedef boost::is_floating_point<long double>::type fp_tag;
++ //typedef boost::is_floating_point<long double>::type fp_tag;
+ typedef long double value_type;
+ return detail::isinf_impl(static_cast<value_type>(x), method());
+ }
+@@ -594,7 +594,7 @@ inline bool (isnan)(long double x)
+ { //!< \brief return true if floating-point type t is NaN (Not A Number).
+ typedef detail::fp_traits<long double>::type traits;
+ typedef traits::method method;
+- typedef boost::is_floating_point<long double>::type fp_tag;
++ //typedef boost::is_floating_point<long double>::type fp_tag;
+ return detail::isnan_impl(x, method());
+ }
+ #endif
Property changes on: trunk/devel/boost-libs/files/patch-5a9688e4ef22c51f77bf147589e3306bf8fd03df
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/boost-libs/files/patch-7d1bf7680301331073761e81b85989b9ecee56d5
===================================================================
--- trunk/devel/boost-libs/files/patch-7d1bf7680301331073761e81b85989b9ecee56d5 (rev 0)
+++ trunk/devel/boost-libs/files/patch-7d1bf7680301331073761e81b85989b9ecee56d5 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,10 @@
+--- boost/spirit/home/classic/core/primitives/primitives.hpp.orig 2008-06-22 15:05:38 UTC
++++ boost/spirit/home/classic/core/primitives/primitives.hpp
+@@ -47,7 +47,6 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+ typename parser_result<self_t, ScannerT>::type
+ parse(ScannerT const& scan) const
+ {
+- typedef typename parser_result<self_t, ScannerT>::type result_t;
+ typedef typename ScannerT::value_t value_t;
+ typedef typename ScannerT::iterator_t iterator_t;
+
Property changes on: trunk/devel/boost-libs/files/patch-7d1bf7680301331073761e81b85989b9ecee56d5
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/boost-libs/files/patch-a6b17d900155d2a04f54ad18fd89197001f231ab
===================================================================
--- trunk/devel/boost-libs/files/patch-a6b17d900155d2a04f54ad18fd89197001f231ab (rev 0)
+++ trunk/devel/boost-libs/files/patch-a6b17d900155d2a04f54ad18fd89197001f231ab 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,12 @@
+--- boost/bind/arg.hpp.orig 2007-11-25 18:07:19 UTC
++++ boost/bind/arg.hpp
+@@ -33,8 +33,7 @@ template< int I > struct arg
+
+ template< class T > arg( T const & /* t */ )
+ {
+- // static assert I == is_placeholder<T>::value
+- typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
++ BOOST_STATIC_ASSERT( I == is_placeholder<T>::value );
+ }
+ };
+
Property changes on: trunk/devel/boost-libs/files/patch-a6b17d900155d2a04f54ad18fd89197001f231ab
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f
===================================================================
--- trunk/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f (rev 0)
+++ trunk/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,49 @@
+--- boost/asio/ssl/impl/context.ipp.orig 2013-10-26 23:25:53 UTC
++++ boost/asio/ssl/impl/context.ipp
+@@ -87,6 +87,14 @@ context::context(context::method m)
+ handle_ = ::SSL_CTX_new(::SSLv2_server_method());
+ break;
+ #endif // defined(OPENSSL_NO_SSL2)
++#if defined(OPENSSL_NO_SSL3)
++ case context::sslv3:
++ case context::sslv3_client:
++ case context::sslv3_server:
++ boost::asio::detail::throw_error(
++ boost::asio::error::invalid_argument, "context");
++ break;
++#else // defined(OPENSSL_NO_SSL3)
+ case context::sslv3:
+ handle_ = ::SSL_CTX_new(::SSLv3_method());
+ break;
+@@ -96,6 +104,7 @@ context::context(context::method m)
+ case context::sslv3_server:
+ handle_ = ::SSL_CTX_new(::SSLv3_server_method());
+ break;
++#endif // defined(OPENSSL_NO_SSL3)
+ case context::tlsv1:
+ handle_ = ::SSL_CTX_new(::TLSv1_method());
+ break;
+--- boost/asio/ssl/old/detail/openssl_context_service.hpp.orig 2013-05-20 12:32:20 UTC
++++ boost/asio/ssl/old/detail/openssl_context_service.hpp
+@@ -85,6 +85,13 @@ public:
+ impl = ::SSL_CTX_new(::SSLv2_server_method());
+ break;
+ #endif // defined(OPENSSL_NO_SSL2)
++#if defined(OPENSSL_NO_SSL3)
++ case context_base::sslv3:
++ case context_base::sslv3_client:
++ case context_base::sslv3_server:
++ boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
++ break;
++#else // defined(OPENSSL_NO_SSL3)
+ case context_base::sslv3:
+ impl = ::SSL_CTX_new(::SSLv3_method());
+ break;
+@@ -94,6 +101,7 @@ public:
+ case context_base::sslv3_server:
+ impl = ::SSL_CTX_new(::SSLv3_server_method());
+ break;
++#endif // defined(OPENSSL_NO_SSL3)
+ case context_base::tlsv1:
+ impl = ::SSL_CTX_new(::TLSv1_method());
+ break;
Property changes on: trunk/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/boost-libs/files/patch-boost__archive__iterators__transorm_width.hpp
===================================================================
--- trunk/devel/boost-libs/files/patch-boost__archive__iterators__transorm_width.hpp 2016-08-05 23:37:38 UTC (rev 21511)
+++ trunk/devel/boost-libs/files/patch-boost__archive__iterators__transorm_width.hpp 2016-08-05 23:41:12 UTC (rev 21512)
@@ -1,5 +1,5 @@
---- boost/archive/iterators/transform_width.hpp.orig 2013-04-28 18:07:27.000000000 +0200
-+++ boost/archive/iterators/transform_width.hpp 2014-06-09 17:27:54.615330893 +0200
+--- boost/archive/iterators/transform_width.hpp.orig 2013-04-29 01:07:27.000000000 +0900
++++ boost/archive/iterators/transform_width.hpp 2015-08-30 04:46:06.968463000 +0900
@@ -30,6 +30,8 @@
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_traits.hpp>
@@ -9,3 +9,21 @@
namespace boost {
namespace archive {
namespace iterators {
+@@ -112,6 +114,7 @@
+ transform_width(BOOST_PFTO_WRAPPER(T) start) :
+ super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))),
+ m_buffer_out_full(false),
++ m_buffer_in(0),
+ m_remaining_bits(0),
+ m_end_of_sequence(false)
+ {}
+@@ -119,8 +122,8 @@
+ transform_width(const transform_width & rhs) :
+ super_t(rhs.base_reference()),
+ m_buffer_out_full(rhs.m_buffer_out_full),
+- m_remaining_bits(rhs.m_remaining_bits),
+ m_buffer_in(rhs.m_buffer_in),
++ m_remaining_bits(rhs.m_remaining_bits),
+ m_end_of_sequence(false)
+ {}
+ };
Added: trunk/devel/boost-libs/files/patch-boost_static__assert.hpp
===================================================================
--- trunk/devel/boost-libs/files/patch-boost_static__assert.hpp (rev 0)
+++ trunk/devel/boost-libs/files/patch-boost_static__assert.hpp 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,11 @@
+--- boost/static_assert.hpp.orig 2013-09-21 20:17:00 UTC
++++ boost/static_assert.hpp
+@@ -67,7 +67,7 @@
+ //
+ // If the compiler warns about unused typedefs then enable this:
+ //
+-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
++#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) || defined(__clang__)
+ # define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
+ #else
+ # define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
Property changes on: trunk/devel/boost-libs/files/patch-boost_static__assert.hpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/boost-libs/files/patch-f9b3dcb203f29dff4b264d2430f7dca9ebd43ea6
===================================================================
--- trunk/devel/boost-libs/files/patch-f9b3dcb203f29dff4b264d2430f7dca9ebd43ea6 (rev 0)
+++ trunk/devel/boost-libs/files/patch-f9b3dcb203f29dff4b264d2430f7dca9ebd43ea6 2016-08-05 23:41:12 UTC (rev 21512)
@@ -0,0 +1,10 @@
+--- boost/tuple/detail/tuple_basic.hpp.orig 2011-01-02 20:25:11 UTC
++++ boost/tuple/detail/tuple_basic.hpp
+@@ -225,7 +225,6 @@ inline typename access_traits<
+ get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
+ typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
+ apply<cons<HT, TT> > impl;
+- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
+ return impl::call(c).head;
+ }
+
Property changes on: trunk/devel/boost-libs/files/patch-f9b3dcb203f29dff4b264d2430f7dca9ebd43ea6
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list