[140988] trunk/dports/devel/boost
michaelld at macports.org
michaelld at macports.org
Wed Oct 7 08:40:58 PDT 2015
Revision: 140988
https://trac.macports.org/changeset/140988
Author: michaelld at macports.org
Date: 2015-10-07 08:40:57 -0700 (Wed, 07 Oct 2015)
Log Message:
-----------
boost: add temporary patch to fix: explicit template instanciations in # boost::serialization don't get exported with all compilers. Add myself as potential maintainer along with ryandesign, but leaving openmaintainer too.
Modified Paths:
--------------
trunk/dports/devel/boost/Portfile
Added Paths:
-----------
trunk/dports/devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff
Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile 2015-10-07 15:34:58 UTC (rev 140987)
+++ trunk/dports/devel/boost/Portfile 2015-10-07 15:40:57 UTC (rev 140988)
@@ -7,11 +7,11 @@
name boost
version 1.59.0
-revision 1
+revision 2
license Boost-1
categories devel
platforms darwin
-maintainers ryandesign openmaintainer
+maintainers ryandesign michaelld openmaintainer
description Collection of portable C++ source libraries
@@ -60,6 +60,15 @@
# OS versions without affecting build on 10.6 and less (where clang is not
# the default compiler) or 10.9 and up (where libc++ is the default).
+# temporary patch to fix: explicit template instanciations in
+# boost::serialization don't get exported with all compilers; this fix
+# is already in the boost repo & will be part of the next release. See
+# also the following tickets:
+# https://trac.macports.org/ticket/48717
+# https://svn.boost.org/trac/boost/ticket/11671
+
+patchfiles-append patch-export_serialization_explicit_template_instantiations.diff
+
post-patch {
reinplace "s|%%CONFIGURE.CC%%|${configure.cc}|g" ${worksrcpath}/tools/build/src/engine/build.jam \
${worksrcpath}/tools/build/src/engine/build.sh
Added: trunk/dports/devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff (rev 0)
+++ trunk/dports/devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff 2015-10-07 15:40:57 UTC (rev 140988)
@@ -0,0 +1,510 @@
+--- libs/serialization/src/basic_text_iprimitive.cpp.orig
++++ libs/serialization/src/basic_text_iprimitive.cpp
+@@ -12,7 +12,9 @@
+ # pragma warning (disable : 4786) // too long name, harmless warning
+ #endif
+
++#pragma GCC visibility push(default)
+ #include <istream>
++#pragma GCC visibility pop
+
+ #define BOOST_ARCHIVE_SOURCE
+ #include <boost/archive/detail/auto_link_archive.hpp>
+@@ -22,7 +24,7 @@
+ namespace archive {
+
+ // explicitly instantiate for this type of text stream
+-template class basic_text_iprimitive<std::istream> ;
++template class BOOST_SYMBOL_VISIBLE basic_text_iprimitive<std::istream> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/basic_text_oprimitive.cpp.orig
++++ libs/serialization/src/basic_text_oprimitive.cpp
+@@ -12,7 +12,9 @@
+ # pragma warning (disable : 4786) // too long name, harmless warning
+ #endif
+
++#pragma GCC visibility push(default)
+ #include <ostream>
++#pragma GCC visibility pop
+
+ #define BOOST_ARCHIVE_SOURCE
+ #include <boost/archive/detail/auto_link_archive.hpp>
+@@ -22,7 +24,7 @@
+ namespace archive {
+
+ // explicitly instantiate for this type of text stream
+-template class basic_text_oprimitive<std::ostream> ;
++template class BOOST_SYMBOL_VISIBLE basic_text_oprimitive<std::ostream> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/basic_text_wiprimitive.cpp.orig
++++ libs/serialization/src/basic_text_wiprimitive.cpp
+@@ -18,7 +18,9 @@
+ # pragma warning (disable : 4786) // too long name, harmless warning
+ #endif
+
++#pragma GCC visibility push(default)
+ #include <istream>
++#pragma GCC visibility pop
+
+ #define BOOST_WARCHIVE_SOURCE
+ #include <boost/archive/detail/auto_link_warchive.hpp>
+@@ -27,7 +29,7 @@
+ namespace boost {
+ namespace archive {
+
+-template class basic_text_iprimitive<std::wistream> ;
++template class BOOST_SYMBOL_VISIBLE basic_text_iprimitive<std::wistream> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/basic_text_woprimitive.cpp.orig
++++ libs/serialization/src/basic_text_woprimitive.cpp
+@@ -18,7 +18,9 @@
+ # pragma warning (disable : 4786) // too long name, harmless warning
+ #endif
+
++#pragma GCC visibility push(default)
+ #include <ostream>
++#pragma GCC visibility pop
+
+ #define BOOST_WARCHIVE_SOURCE
+ #include <boost/archive/detail/auto_link_warchive.hpp>
+@@ -27,7 +29,7 @@
+ namespace boost {
+ namespace archive {
+
+-template class basic_text_oprimitive<std::wostream> ;
++template class BOOST_SYMBOL_VISIBLE basic_text_oprimitive<std::wostream> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/basic_xml_grammar.ipp.orig
++++ libs/serialization/src/basic_xml_grammar.ipp
+@@ -12,7 +12,9 @@
+ # pragma warning (disable : 4786) // too long name, harmless warning
+ #endif
+
++#pragma GCC visibility push(default)
+ #include <istream>
++#pragma GCC visibility pop
+ #include <algorithm>
+ #include <boost/config.hpp> // typename
+
+--- libs/serialization/src/binary_iarchive.cpp.orig
++++ libs/serialization/src/binary_iarchive.cpp
+@@ -8,10 +8,14 @@
+
+ // See http://www.boost.org for updates, documentation, and revision history.
+
++#pragma GCC visibility push(default)
+ #include <istream>
++#pragma GCC visibility pop
+
+ #define BOOST_ARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/binary_iarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ #include <boost/archive/impl/archive_serializer_map.ipp>
+@@ -22,14 +26,14 @@
+ namespace archive {
+
+ // explicitly instantiate for this type of stream
+-template class detail::archive_serializer_map<binary_iarchive>;
+-template class basic_binary_iprimitive<
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<binary_iarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_binary_iprimitive<
+ binary_iarchive,
+ std::istream::char_type,
+ std::istream::traits_type
+ >;
+-template class basic_binary_iarchive<binary_iarchive> ;
+-template class binary_iarchive_impl<
++template class BOOST_SYMBOL_VISIBLE basic_binary_iarchive<binary_iarchive> ;
++template class BOOST_SYMBOL_VISIBLE binary_iarchive_impl<
+ binary_iarchive,
+ std::istream::char_type,
+ std::istream::traits_type
+--- libs/serialization/src/binary_oarchive.cpp.orig
++++ libs/serialization/src/binary_oarchive.cpp
+@@ -8,10 +8,14 @@
+
+ // See http://www.boost.org for updates, documentation, and revision history.
+
++#pragma GCC visibility push(default)
+ #include <ostream>
++#pragma GCC visibility pop
+
+ #define BOOST_ARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/binary_oarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of binary stream
+@@ -22,14 +26,14 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<binary_oarchive>;
+-template class basic_binary_oprimitive<
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<binary_oarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_binary_oprimitive<
+ binary_oarchive,
+ std::ostream::char_type,
+ std::ostream::traits_type
+ >;
+-template class basic_binary_oarchive<binary_oarchive> ;
+-template class binary_oarchive_impl<
++template class BOOST_SYMBOL_VISIBLE basic_binary_oarchive<binary_oarchive> ;
++template class BOOST_SYMBOL_VISIBLE binary_oarchive_impl<
+ binary_oarchive,
+ std::ostream::char_type,
+ std::ostream::traits_type
+--- libs/serialization/src/binary_wiarchive.cpp.orig
++++ libs/serialization/src/binary_wiarchive.cpp
+@@ -15,7 +15,9 @@
+ #else
+
+ #define BOOST_WARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/binary_wiarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of text stream
+@@ -27,14 +29,14 @@
+ namespace archive {
+
+ // explicitly instantiate for this type of text stream
+-template class detail::archive_serializer_map<binary_wiarchive>;
+-template class basic_binary_iprimitive<
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<binary_wiarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_binary_iprimitive<
+ binary_wiarchive,
+ wchar_t,
+ std::char_traits<wchar_t>
+ >;
+-template class basic_binary_iarchive<binary_wiarchive> ;
+-template class binary_iarchive_impl<
++template class BOOST_SYMBOL_VISIBLE basic_binary_iarchive<binary_wiarchive> ;
++template class BOOST_SYMBOL_VISIBLE binary_iarchive_impl<
+ binary_wiarchive,
+ wchar_t,
+ std::char_traits<wchar_t>
+--- libs/serialization/src/binary_woarchive.cpp.orig
++++ libs/serialization/src/binary_woarchive.cpp
+@@ -15,7 +15,9 @@
+ #else
+
+ #define BOOST_WARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/binary_woarchive.hpp>
++#pragma GCC visibility pop
+
+ // explicitly instantiate for this type of text stream
+ #include <boost/archive/impl/archive_serializer_map.ipp>
+@@ -25,14 +27,14 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<binary_woarchive>;
+-template class basic_binary_oprimitive<
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<binary_woarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_binary_oprimitive<
+ binary_woarchive,
+ wchar_t,
+ std::char_traits<wchar_t>
+ >;
+-template class basic_binary_oarchive<binary_woarchive> ;
+-template class binary_oarchive_impl<
++template class BOOST_SYMBOL_VISIBLE basic_binary_oarchive<binary_woarchive> ;
++template class BOOST_SYMBOL_VISIBLE binary_oarchive_impl<
+ binary_woarchive,
+ wchar_t,
+ std::char_traits<wchar_t>
+--- libs/serialization/src/polymorphic_iarchive.cpp.orig
++++ libs/serialization/src/polymorphic_iarchive.cpp
+@@ -16,13 +16,15 @@
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ #include <boost/archive/impl/archive_serializer_map.ipp>
++#pragma GCC visibility push(default)
+ #include <boost/archive/polymorphic_iarchive.hpp>
++#pragma GCC visibility pop
+
+ namespace boost {
+ namespace archive {
+ namespace detail {
+
+-template class archive_serializer_map<polymorphic_iarchive>;
++template class BOOST_SYMBOL_VISIBLE archive_serializer_map<polymorphic_iarchive>;
+
+ } // detail
+ } // archive
+--- libs/serialization/src/polymorphic_oarchive.cpp.orig
++++ libs/serialization/src/polymorphic_oarchive.cpp
+@@ -16,13 +16,15 @@
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ #include <boost/archive/impl/archive_serializer_map.ipp>
++#pragma GCC visibility push(default)
+ #include <boost/archive/polymorphic_oarchive.hpp>
++#pragma GCC visibility pop
+
+ namespace boost {
+ namespace archive {
+ namespace detail {
+
+-template class archive_serializer_map<polymorphic_oarchive>;
++template class BOOST_SYMBOL_VISIBLE archive_serializer_map<polymorphic_oarchive>;
+
+ } // detail
+ } // archive
+--- libs/serialization/src/text_iarchive.cpp.orig
++++ libs/serialization/src/text_iarchive.cpp
+@@ -13,7 +13,9 @@
+ #endif
+
+ #define BOOST_ARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/text_iarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of text stream
+@@ -24,9 +26,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<text_iarchive>;
+-template class basic_text_iarchive<text_iarchive> ;
+-template class text_iarchive_impl<text_iarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<text_iarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_text_iarchive<text_iarchive> ;
++template class BOOST_SYMBOL_VISIBLE text_iarchive_impl<text_iarchive> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/text_oarchive.cpp.orig
++++ libs/serialization/src/text_oarchive.cpp
+@@ -13,7 +13,9 @@
+ #endif
+
+ #define BOOST_ARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/text_oarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of text stream
+@@ -25,9 +27,9 @@
+ namespace archive {
+
+ //template class basic_text_oprimitive<std::ostream> ;
+-template class detail::archive_serializer_map<text_oarchive>;
+-template class basic_text_oarchive<text_oarchive> ;
+-template class text_oarchive_impl<text_oarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<text_oarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_text_oarchive<text_oarchive> ;
++template class BOOST_SYMBOL_VISIBLE text_oarchive_impl<text_oarchive> ;
+
+ } // namespace serialization
+ } // namespace boost
+--- libs/serialization/src/text_wiarchive.cpp.orig
++++ libs/serialization/src/text_wiarchive.cpp
+@@ -15,7 +15,9 @@
+ #else
+
+ #define BOOST_WARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/text_wiarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of text stream
+@@ -26,9 +28,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<text_wiarchive>;
+-template class basic_text_iarchive<text_wiarchive> ;
+-template class text_wiarchive_impl<text_wiarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<text_wiarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_text_iarchive<text_wiarchive> ;
++template class BOOST_SYMBOL_VISIBLE text_wiarchive_impl<text_wiarchive> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/text_woarchive.cpp.orig
++++ libs/serialization/src/text_woarchive.cpp
+@@ -14,7 +14,9 @@
+ #else
+
+ #define BOOST_WARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/text_woarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of text stream
+@@ -25,9 +27,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<text_woarchive>;
+-template class basic_text_oarchive<text_woarchive> ;
+-template class text_woarchive_impl<text_woarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<text_woarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_text_oarchive<text_woarchive> ;
++template class BOOST_SYMBOL_VISIBLE text_woarchive_impl<text_woarchive> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/xml_grammar.cpp.orig
++++ libs/serialization/src/xml_grammar.cpp
+@@ -13,7 +13,9 @@
+ #endif
+
+ #define BOOST_ARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/impl/basic_xml_grammar.hpp>
++#pragma GCC visibility pop
+
+ using namespace boost::spirit::classic;
+
+@@ -66,7 +68,7 @@
+ namespace archive {
+
+ // explicit instantiation of xml for 8 bit characters
+-template class basic_xml_grammar<char>;
++template class BOOST_SYMBOL_VISIBLE basic_xml_grammar<char>;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/xml_iarchive.cpp.orig
++++ libs/serialization/src/xml_iarchive.cpp
+@@ -17,7 +17,9 @@
+ #include <boost/config.hpp>
+ #include <boost/detail/workaround.hpp>
+
++#pragma GCC visibility push(default)
+ #include <boost/archive/xml_iarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of xml stream
+@@ -28,9 +30,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<xml_iarchive>;
+-template class basic_xml_iarchive<xml_iarchive> ;
+-template class xml_iarchive_impl<xml_iarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<xml_iarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_xml_iarchive<xml_iarchive> ;
++template class BOOST_SYMBOL_VISIBLE xml_iarchive_impl<xml_iarchive> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/xml_oarchive.cpp.orig
++++ libs/serialization/src/xml_oarchive.cpp
+@@ -13,7 +13,9 @@
+ #endif
+
+ #define BOOST_ARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/xml_oarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of xml stream
+@@ -24,9 +26,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<xml_oarchive>;
+-template class basic_xml_oarchive<xml_oarchive> ;
+-template class xml_oarchive_impl<xml_oarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<xml_oarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_xml_oarchive<xml_oarchive> ;
++template class BOOST_SYMBOL_VISIBLE xml_oarchive_impl<xml_oarchive> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/xml_wgrammar.cpp.orig
++++ libs/serialization/src/xml_wgrammar.cpp
+@@ -15,7 +15,9 @@
+ #else
+
+ #define BOOST_WARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/impl/basic_xml_grammar.hpp>
++#pragma GCC visibility pop
+
+ using namespace boost::spirit::classic;
+
+@@ -149,7 +151,7 @@
+ namespace archive {
+
+ // explicit instantiation of xml for wide characters
+-template class basic_xml_grammar<wchar_t>;
++template class BOOST_SYMBOL_VISIBLE basic_xml_grammar<wchar_t>;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/xml_wiarchive.cpp.orig
++++ libs/serialization/src/xml_wiarchive.cpp
+@@ -21,7 +21,9 @@
+
+ #define BOOST_WARCHIVE_SOURCE
+
++#pragma GCC visibility push(default)
+ #include <boost/archive/xml_wiarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of xml stream
+@@ -32,9 +34,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<xml_wiarchive>;
+-template class basic_xml_iarchive<xml_wiarchive> ;
+-template class xml_wiarchive_impl<xml_wiarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<xml_wiarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_xml_iarchive<xml_wiarchive> ;
++template class BOOST_SYMBOL_VISIBLE xml_wiarchive_impl<xml_wiarchive> ;
+
+ } // namespace archive
+ } // namespace boost
+--- libs/serialization/src/xml_woarchive.cpp.orig
++++ libs/serialization/src/xml_woarchive.cpp
+@@ -14,7 +14,9 @@
+ #else
+
+ #define BOOST_WARCHIVE_SOURCE
++#pragma GCC visibility push(default)
+ #include <boost/archive/xml_woarchive.hpp>
++#pragma GCC visibility pop
+ #include <boost/archive/detail/archive_serializer_map.hpp>
+
+ // explicitly instantiate for this type of text stream
+@@ -25,9 +27,9 @@
+ namespace boost {
+ namespace archive {
+
+-template class detail::archive_serializer_map<xml_woarchive>;
+-template class basic_xml_oarchive<xml_woarchive> ;
+-template class xml_woarchive_impl<xml_woarchive> ;
++template class BOOST_SYMBOL_VISIBLE detail::archive_serializer_map<xml_woarchive>;
++template class BOOST_SYMBOL_VISIBLE basic_xml_oarchive<xml_woarchive> ;
++template class BOOST_SYMBOL_VISIBLE xml_woarchive_impl<xml_woarchive> ;
+
+ } // namespace archive
+ } // namespace boost
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151007/dfa4dc91/attachment-0001.html>
More information about the macports-changes
mailing list