Ticket #50671: boost_update_to_1.63.0.diff
File boost_update_to_1.63.0.diff, 21.7 KB (added by michaelld (Michael Dickens), 8 years ago) |
---|
-
devel/boost/Portfile
diff --git a/devel/boost/Portfile b/devel/boost/Portfile index 9bada98f60..393fe54377 100644
a b 1 1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 2 # $Id$3 2 4 3 PortSystem 1.0 5 4 PortGroup compiler_blacklist_versions 1.0 6 5 PortGroup mpi 1.0 7 6 8 7 name boost 9 version 1.59.0 10 revision 2 8 version 1.63.0 11 9 license Boost-1 12 10 categories devel 13 11 platforms darwin … … set distver [join [split ${version} .] _] 26 24 distname ${name}_${distver} 27 25 use_bzip2 yes 28 26 29 checksums rmd160 a106b3cd1dbda2323e5e84c7106cedee327db03c \ 30 sha256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca 27 checksums \ 28 rmd160 9781b51fcf1919b98ef3356af988fd8a73e7accb \ 29 sha256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 31 30 32 31 depends_lib port:zlib \ 33 32 port:expat \ … … post-extract { 45 44 46 45 patchfiles patch-tools-build-src-engine-build.sh.diff \ 47 46 patch-tools-build-src-engine-build.jam.diff \ 48 patch-apple-clang-no-libcxx.diff \ 49 patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff \ 50 patch-log-setup-link.diff 47 patch-apple-clang-no-libcxx.diff 51 48 # patch-apple-clang-no-libcxx.diff fixes a clang configuration 52 49 # error that occurs on OS X 10.7 and 10.8 due to the assumption 53 50 # that if clang is the compiler in use it must be using libc++. … … patchfiles patch-tools-build-src-engine-build.sh.diff \ 62 59 63 60 # temporary patch to fix: explicit template instanciations in 64 61 # boost::serialization don't get exported with all compilers; this fix 65 # is already in the boost repo & will be part of the nextrelease. See62 # is already in the boost repo & will be part of a future release. See 66 63 # also the following tickets: 67 64 # https://trac.macports.org/ticket/48717 68 65 # https://svn.boost.org/trac/boost/ticket/11671 -
devel/boost/files/patch-apple-clang-no-libcxx.diff
diff --git a/devel/boost/files/patch-apple-clang-no-libcxx.diff b/devel/boost/files/patch-apple-clang-no-libcxx.diff index c4b102ec7e..22c2090be9 100644
a b 1 diff --git boost/config/compiler/clang.hpp boost/config/compiler/clang.hpp2 1 --- boost/config/compiler/clang.hpp 3 2 +++ boost/config/compiler/clang.hpp 4 @@ -199,10 +199,20 @@ 5 6 #if !__has_feature(cxx_inline_namespaces) 3 @@ -232,6 +232,16 @@ 7 4 # define BOOST_NO_CXX11_INLINE_NAMESPACES 8 5 #endif 9 6 … … diff --git boost/config/compiler/clang.hpp boost/config/compiler/clang.hpp 20 17 #if !__has_feature(cxx_override_control) 21 18 # define BOOST_NO_CXX11_FINAL 22 19 #endif 23 24 #if !(__has_feature(cxx_binary_literals) || __has_extension(cxx_binary_literals))25 diff --git boost/multi_index/detail/vartempl_support.hpp boost/multi_index/detail/vartempl_support.hpp26 20 --- boost/multi_index/detail/vartempl_support.hpp 27 21 +++ boost/multi_index/detail/vartempl_support.hpp 28 22 @@ -40,11 +40,12 @@ -
devel/boost/files/patch-boost-python3.diff
diff --git a/devel/boost/files/patch-boost-python3.diff b/devel/boost/files/patch-boost-python3.diff index bc7f454fb5..f90e84b32b 100644
a b 1 diff -Naur libs/mpi/src/python/datatypes.cpp libs/mpi/src/python/datatypes.cpp 2 --- libs/mpi/src/python/datatypes.cpp 2007-11-25 13:38:02.000000000 -0500 3 +++ libs/mpi/src/python/datatypes.cpp 2013-03-11 20:59:57.171732691 -0400 1 --- libs/mpi/src/python/datatypes.cpp.orig 2 +++ libs/mpi/src/python/datatypes.cpp 4 3 @@ -13,6 +13,10 @@ 5 4 #include <boost/mpi/python/serialize.hpp> 6 5 #include <boost/mpi.hpp> … … diff -Naur libs/mpi/src/python/datatypes.cpp libs/mpi/src/python/datatypes.cpp 12 11 namespace boost { namespace mpi { namespace python { 13 12 14 13 void export_datatypes() 15 diff -Naur libs/mpi/build/__init__.py llibs/mpi/build/__init__.py 16 --- libs/mpi/build/__init__.py 2013-11-27 12:52:37.000000000 -0600 17 +++ libs/mpi/build/__init__.py 2013-11-27 12:52:55.000000000 -0600 14 --- libs/mpi/build/__init__.py.orig 15 +++ libs/mpi/build/__init__.py 18 16 @@ -6,5 +6,5 @@ 19 17 import mpi 20 18 sys.setdlopenflags(flags) -
devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff
diff --git a/devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff b/devel/boost/files/patch-export_serialization_explicit_template_instantiations.diff index 8a8217922c..712fb1f3cb 100644
a b 9 9 +#pragma GCC visibility pop 10 10 11 11 #define BOOST_ARCHIVE_SOURCE 12 #include <boost/ archive/detail/auto_link_archive.hpp>13 @@ -2 2,7 +24,7 @@12 #include <boost/serialization/config.hpp> 13 @@ -23,7 +25,7 @@ namespace boost { 14 14 namespace archive { 15 15 16 16 // explicitly instantiate for this type of text stream … … 30 30 +#pragma GCC visibility pop 31 31 32 32 #define BOOST_ARCHIVE_SOURCE 33 #include <boost/ archive/detail/auto_link_archive.hpp>34 @@ -2 2,7 +24,7 @@33 #include <boost/serialization/config.hpp> 34 @@ -23,7 +25,7 @@ namespace boost { 35 35 namespace archive { 36 36 37 37 // explicitly instantiate for this type of text stream … … 42 42 } // namespace boost 43 43 --- libs/serialization/src/basic_text_wiprimitive.cpp.orig 44 44 +++ libs/serialization/src/basic_text_wiprimitive.cpp 45 @@ - 18,7 +18,9 @@46 # pragma warning (disable : 4786) // too long name, harmless warning47 #endif45 @@ -8,7 +8,9 @@ 46 47 // See http://www.boost.org for updates, documentation, and revision history. 48 48 49 49 +#pragma GCC visibility push(default) 50 50 #include <istream> 51 51 +#pragma GCC visibility pop 52 52 53 # define BOOST_WARCHIVE_SOURCE54 #include <boost/archive/detail/auto_link_warchive.hpp>55 @@ -2 7,7 +29,7 @@53 #include <boost/config.hpp> 54 55 @@ -28,7 +30,7 @@ 56 56 namespace boost { 57 57 namespace archive { 58 58 … … 63 63 } // namespace boost 64 64 --- libs/serialization/src/basic_text_woprimitive.cpp.orig 65 65 +++ libs/serialization/src/basic_text_woprimitive.cpp 66 @@ - 18,7 +18,9 @@67 # pragma warning (disable : 4786) // too long name, harmless warning68 #endif66 @@ -8,7 +8,9 @@ 67 68 // See http://www.boost.org for updates, documentation, and revision history. 69 69 70 70 +#pragma GCC visibility push(default) 71 71 #include <ostream> 72 72 +#pragma GCC visibility pop 73 73 74 # define BOOST_WARCHIVE_SOURCE75 #include <boost/archive/detail/auto_link_warchive.hpp>76 @@ -2 7,7 +29,7 @@74 #include <boost/config.hpp> 75 76 @@ -28,7 +30,7 @@ 77 77 namespace boost { 78 78 namespace archive { 79 79 … … 96 96 97 97 --- libs/serialization/src/binary_iarchive.cpp.orig 98 98 +++ libs/serialization/src/binary_iarchive.cpp 99 @@ -8,1 0 +8,14@@99 @@ -8,11 +8,15 @@ 100 100 101 101 // See http://www.boost.org for updates, documentation, and revision history. 102 102 … … 105 105 +#pragma GCC visibility pop 106 106 107 107 #define BOOST_ARCHIVE_SOURCE 108 #include <boost/serialization/config.hpp> 108 109 +#pragma GCC visibility push(default) 109 110 #include <boost/archive/binary_iarchive.hpp> 110 111 +#pragma GCC visibility pop 111 112 #include <boost/archive/detail/archive_serializer_map.hpp> 112 113 113 114 #include <boost/archive/impl/archive_serializer_map.ipp> 114 @@ -2 2,14 +26,14 @@115 @@ -23,14 +27,14 @@ namespace boost { 115 116 namespace archive { 116 117 117 118 // explicitly instantiate for this type of stream … … 132 133 std::istream::traits_type 133 134 --- libs/serialization/src/binary_oarchive.cpp.orig 134 135 +++ libs/serialization/src/binary_oarchive.cpp 135 @@ -8,1 0 +8,14@@136 @@ -8,11 +8,15 @@ 136 137 137 138 // See http://www.boost.org for updates, documentation, and revision history. 138 139 … … 141 142 +#pragma GCC visibility pop 142 143 143 144 #define BOOST_ARCHIVE_SOURCE 145 #include <boost/serialization/config.hpp> 144 146 +#pragma GCC visibility push(default) 145 147 #include <boost/archive/binary_oarchive.hpp> 146 148 +#pragma GCC visibility pop 147 149 #include <boost/archive/detail/archive_serializer_map.hpp> 148 150 149 151 // explicitly instantiate for this type of binary stream 150 @@ -2 2,14 +26,14 @@152 @@ -23,14 +27,14 @@ 151 153 namespace boost { 152 154 namespace archive { 153 155 … … 178 180 #include <boost/archive/detail/archive_serializer_map.hpp> 179 181 180 182 // explicitly instantiate for this type of text stream 181 @@ -27,14 +29,14 @@ 183 @@ -27,14 +29,14 @@ namespace boost { 182 184 namespace archive { 183 185 184 186 // explicitly instantiate for this type of text stream … … 230 232 std::char_traits<wchar_t> 231 233 --- libs/serialization/src/polymorphic_iarchive.cpp.orig 232 234 +++ libs/serialization/src/polymorphic_iarchive.cpp 233 @@ -1 6,13 +16,15 @@235 @@ -17,13 +17,15 @@ 234 236 #include <boost/archive/detail/archive_serializer_map.hpp> 235 237 236 238 #include <boost/archive/impl/archive_serializer_map.ipp> … … 249 251 } // archive 250 252 --- libs/serialization/src/polymorphic_oarchive.cpp.orig 251 253 +++ libs/serialization/src/polymorphic_oarchive.cpp 252 @@ -1 6,13 +16,15 @@254 @@ -17,13 +17,15 @@ 253 255 #include <boost/archive/detail/archive_serializer_map.hpp> 254 256 255 257 #include <boost/archive/impl/archive_serializer_map.ipp> … … 268 270 } // archive 269 271 --- libs/serialization/src/text_iarchive.cpp.orig 270 272 +++ libs/serialization/src/text_iarchive.cpp 271 @@ -13,7 +13,9 @@ 272 #endif 273 @@ -14,7 +14,9 @@ 273 274 274 275 #define BOOST_ARCHIVE_SOURCE 276 #include <boost/serialization/config.hpp> 275 277 +#pragma GCC visibility push(default) 276 278 #include <boost/archive/text_iarchive.hpp> 277 279 +#pragma GCC visibility pop 278 280 #include <boost/archive/detail/archive_serializer_map.hpp> 279 281 280 282 // explicitly instantiate for this type of text stream 281 @@ -2 4,9 +26,9 @@283 @@ -25,9 +27,9 @@ 282 284 namespace boost { 283 285 namespace archive { 284 286 … … 293 295 } // namespace boost 294 296 --- libs/serialization/src/text_oarchive.cpp.orig 295 297 +++ libs/serialization/src/text_oarchive.cpp 296 @@ -13,7 +13,9 @@ 297 #endif 298 @@ -14,7 +14,9 @@ 298 299 299 300 #define BOOST_ARCHIVE_SOURCE 301 #include <boost/serialization/config.hpp> 300 302 +#pragma GCC visibility push(default) 301 303 #include <boost/archive/text_oarchive.hpp> 302 304 +#pragma GCC visibility pop 303 305 #include <boost/archive/detail/archive_serializer_map.hpp> 304 306 305 307 // explicitly instantiate for this type of text stream 306 @@ -2 5,9 +27,9 @@308 @@ -26,9 +28,9 @@ namespace boost { 307 309 namespace archive { 308 310 309 311 //template class basic_text_oprimitive<std::ostream> ; … … 318 320 } // namespace boost 319 321 --- libs/serialization/src/text_wiarchive.cpp.orig 320 322 +++ libs/serialization/src/text_wiarchive.cpp 321 @@ -15,7 +15,9 @@ 322 #else 323 @@ -16,7 +16,9 @@ 323 324 324 325 #define BOOST_WARCHIVE_SOURCE 326 #include <boost/serialization/config.hpp> 325 327 +#pragma GCC visibility push(default) 326 328 #include <boost/archive/text_wiarchive.hpp> 327 329 +#pragma GCC visibility pop 328 330 #include <boost/archive/detail/archive_serializer_map.hpp> 329 331 330 332 // explicitly instantiate for this type of text stream 331 @@ -2 6,9 +28,9 @@333 @@ -27,9 +29,9 @@ 332 334 namespace boost { 333 335 namespace archive { 334 336 … … 343 345 } // namespace boost 344 346 --- libs/serialization/src/text_woarchive.cpp.orig 345 347 +++ libs/serialization/src/text_woarchive.cpp 346 @@ -14,7 +14,9 @@ 347 #else 348 @@ -15,7 +15,9 @@ 348 349 349 350 #define BOOST_WARCHIVE_SOURCE 351 #include <boost/serialization/config.hpp> 350 352 +#pragma GCC visibility push(default) 351 353 #include <boost/archive/text_woarchive.hpp> 352 354 +#pragma GCC visibility pop 353 355 #include <boost/archive/detail/archive_serializer_map.hpp> 354 356 355 357 // explicitly instantiate for this type of text stream 356 @@ -2 5,9 +27,9 @@358 @@ -26,9 +28,9 @@ 357 359 namespace boost { 358 360 namespace archive { 359 361 … … 368 370 } // namespace boost 369 371 --- libs/serialization/src/xml_grammar.cpp.orig 370 372 +++ libs/serialization/src/xml_grammar.cpp 371 @@ -13,7 +13,9 @@ 372 #endif 373 @@ -16,7 +16,9 @@ 373 374 374 375 #define BOOST_ARCHIVE_SOURCE 376 #include <boost/serialization/config.hpp> 375 377 +#pragma GCC visibility push(default) 376 378 #include <boost/archive/impl/basic_xml_grammar.hpp> 377 379 +#pragma GCC visibility pop 378 380 379 381 using namespace boost::spirit::classic; 380 382 381 @@ -6 6,7 +68,7 @@383 @@ -67,7 +69,7 @@ namespace boost { 382 384 namespace archive { 383 385 384 386 // explicit instantiation of xml for 8 bit characters … … 389 391 } // namespace boost 390 392 --- libs/serialization/src/xml_iarchive.cpp.orig 391 393 +++ libs/serialization/src/xml_iarchive.cpp 392 @@ -17,7 +17,9 @@ 393 #include <boost/config.hpp> 394 #include <boost/detail/workaround.hpp> 394 @@ -14,7 +14,9 @@ 395 395 396 #define BOOST_ARCHIVE_SOURCE 397 #include <boost/serialization/config.hpp> 396 398 +#pragma GCC visibility push(default) 397 399 #include <boost/archive/xml_iarchive.hpp> 398 400 +#pragma GCC visibility pop 399 401 #include <boost/archive/detail/archive_serializer_map.hpp> 400 402 401 403 // explicitly instantiate for this type of xml stream 402 @@ -2 8,9 +30,9 @@404 @@ -25,9 +27,9 @@ 403 405 namespace boost { 404 406 namespace archive { 405 407 … … 414 416 } // namespace boost 415 417 --- libs/serialization/src/xml_oarchive.cpp.orig 416 418 +++ libs/serialization/src/xml_oarchive.cpp 417 @@ -13,7 +13,9 @@ 418 #endif 419 @@ -14,7 +14,9 @@ 419 420 420 421 #define BOOST_ARCHIVE_SOURCE 422 #include <boost/serialization/config.hpp> 421 423 +#pragma GCC visibility push(default) 422 424 #include <boost/archive/xml_oarchive.hpp> 423 425 +#pragma GCC visibility pop 424 426 #include <boost/archive/detail/archive_serializer_map.hpp> 425 427 426 428 // explicitly instantiate for this type of xml stream 427 @@ -2 4,9 +26,9 @@429 @@ -25,9 +27,9 @@ 428 430 namespace boost { 429 431 namespace archive { 430 432 … … 439 441 } // namespace boost 440 442 --- libs/serialization/src/xml_wgrammar.cpp.orig 441 443 +++ libs/serialization/src/xml_wgrammar.cpp 442 @@ -15,7 +15,9 @@ 443 #else 444 @@ -16,7 +16,9 @@ 444 445 445 446 #define BOOST_WARCHIVE_SOURCE 447 #include <boost/serialization/config.hpp> 446 448 +#pragma GCC visibility push(default) 447 449 #include <boost/archive/impl/basic_xml_grammar.hpp> 448 450 +#pragma GCC visibility pop 449 451 450 452 using namespace boost::spirit::classic; 451 453 452 @@ -149,7 +151,7 @@ 454 @@ -149,7 +151,7 @@ namespace boost { 453 455 namespace archive { 454 456 455 457 // explicit instantiation of xml for wide characters … … 460 462 } // namespace boost 461 463 --- libs/serialization/src/xml_wiarchive.cpp.orig 462 464 +++ libs/serialization/src/xml_wiarchive.cpp 463 @@ - 21,7 +21,9 @@465 @@ -19,7 +19,9 @@ 464 466 465 467 #define BOOST_WARCHIVE_SOURCE 466 468 #include <boost/serialization/config.hpp> 467 469 +#pragma GCC visibility push(default) 468 470 #include <boost/archive/xml_wiarchive.hpp> 469 471 +#pragma GCC visibility pop 470 472 #include <boost/archive/detail/archive_serializer_map.hpp> 471 473 472 474 // explicitly instantiate for this type of xml stream 473 @@ -3 2,9 +34,9 @@475 @@ -30,9 +32,9 @@ 474 476 namespace boost { 475 477 namespace archive { 476 478 … … 485 487 } // namespace boost 486 488 --- libs/serialization/src/xml_woarchive.cpp.orig 487 489 +++ libs/serialization/src/xml_woarchive.cpp 488 @@ -14,7 +14,9 @@ 489 #else 490 @@ -19,7 +19,9 @@ 490 491 491 492 #define BOOST_WARCHIVE_SOURCE 493 #include <boost/serialization/config.hpp> 492 494 +#pragma GCC visibility push(default) 493 495 #include <boost/archive/xml_woarchive.hpp> 494 496 +#pragma GCC visibility pop 495 497 #include <boost/archive/detail/archive_serializer_map.hpp> 496 498 497 499 // explicitly instantiate for this type of text stream 498 @@ - 25,9 +27,9 @@500 @@ -30,9 +32,9 @@ 499 501 namespace boost { 500 502 namespace archive { 501 503 … … 507 509 +template class BOOST_SYMBOL_VISIBLE xml_woarchive_impl<xml_woarchive> ; 508 510 509 511 } // namespace archive 510 } // namespace boost 511 No newline at end of file 512 } // namespace boost -
deleted file devel/boost/files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff
diff --git a/devel/boost/files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff b/devel/boost/files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff deleted file mode 100644 index 7358460ed6..0000000000
+ - 1 Fix build on PowerPC2 https://svn.boost.org/trac/boost/ticket/116033 https://github.com/boostorg/context/commit/8c60232f5f372be9a47e26dbf7f000e9c21cc4a24 --- libs/context/src/asm/make_ppc32_sysv_macho_gas.S.orig5 +++ libs/context/src/asm/make_ppc32_sysv_macho_gas.S6 @@ -82,7 +82,7 @@ _make_fcontext:7 subi r3, r3, 3048 9 ; third arg of make_fcontext() == address of context-function10 - stw r5, 236(%r3)11 + stw r5, 236(r3)12 13 ; load LR14 mflr r0 -
devel/boost/files/patch-libs-mpi-build-Jamfile.v2.diff
diff --git a/devel/boost/files/patch-libs-mpi-build-Jamfile.v2.diff b/devel/boost/files/patch-libs-mpi-build-Jamfile.v2.diff index 2fbc640c0f..638972ae3b 100644
a b 1 --- libs/mpi/build/Jamfile.v2.orig 2010-10-18 02:22:09.000000000 -04002 +++ libs/mpi/build/Jamfile.v2 2010-11-23 13:28:09.000000000 -05003 @@ - 68,6 +68,7 @@1 --- libs/mpi/build/Jamfile.v2.orig 2 +++ libs/mpi/build/Jamfile.v2 3 @@ -49,6 +49,7 @@ 4 4 <link>shared:<define>BOOST_MPI_DYN_LINK=1 5 5 : # Default build 6 6 <link>shared … … 8 8 : # Usage requirements 9 9 <library>../../serialization/build//boost_serialization 10 10 <library>/mpi//mpi [ mpi.extra-requirements ] 11 @@ - 90,6 +91,7 @@12 <define>BOOST_MPI_PYTHON_SOURCE=111 @@ -73,6 +74,7 @@ 12 <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag 13 13 : # Default build 14 14 <link>shared 15 15 + <threading>multi 16 16 : # Usage requirements 17 17 <library>/mpi//mpi [ mpi.extra-requirements ] 18 18 ; 19 @@ -1 18,6 +120,7 @@19 @@ -101,6 +103,7 @@ 20 20 <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1 21 21 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 22 22 <link>shared <runtime-link>shared -
deleted file devel/boost/files/patch-log-setup-link.diff
diff --git a/devel/boost/files/patch-log-setup-link.diff b/devel/boost/files/patch-log-setup-link.diff deleted file mode 100644 index ca0072ddba..0000000000
+ - 1 https://github.com/boostorg/log/pull/102 https://github.com/crmoore/log/commit/870284ed31792708a6139925d00a0aadf46bf09f3 --- boost/log/detail/setup_config.hpp4 +++ boost/log/detail/setup_config.hpp5 @@ -30,11 +30,17 @@6 # define BOOST_LOG_SETUP_DLL7 # endif8 9 -# if defined(BOOST_HAS_DECLSPEC) && defined(BOOST_LOG_SETUP_DLL)10 -# define BOOST_LOG_SETUP_API __declspec(dllimport)11 -# else12 +# if defined(BOOST_LOG_SETUP_DLL)13 +# if defined(BOOST_SYMBOL_IMPORT)14 +# define BOOST_LOG_SETUP_API BOOST_SYMBOL_IMPORT15 +# elif defined(BOOST_HAS_DECLSPEC)16 +# define BOOST_LOG_SETUP_API __declspec(dllimport)17 +# endif18 +# endif19 +# ifndef BOOST_LOG_SETUP_API20 # define BOOST_LOG_SETUP_API21 -# endif // defined(BOOST_HAS_DECLSPEC)22 +# endif23 +24 //25 // Automatically link to the correct build variant where possible.26 //27 @@ -48,12 +54,15 @@28 29 #else // !defined(BOOST_LOG_SETUP_BUILDING_THE_LIB)30 31 -# if defined(BOOST_HAS_DECLSPEC) && defined(BOOST_LOG_SETUP_DLL)32 -# define BOOST_LOG_SETUP_API __declspec(dllexport)33 -# elif defined(__GNUC__) && __GNUC__ >= 4 && (defined(linux) || defined(__linux) || defined(__linux__))34 -# define BOOST_LOG_SETUP_API __attribute__((visibility("default")))35 -# else36 -# define BOOST_LOG_SETUP_API37 +# if defined(BOOST_LOG_SETUP_DLL)38 +# if defined(BOOST_SYMBOL_EXPORT)39 +# define BOOST_LOG_SETUP_API BOOST_SYMBOL_EXPORT40 +# elif defined(BOOST_HAS_DECLSPEC)41 +# define BOOST_LOG_SETUP_API __declspec(dllexport)42 +# endif43 +# endif44 +# ifndef BOOST_LOG_SETUP_API45 +# define BOOST_LOG_SETUP_API BOOST_SYMBOL_VISIBLE46 # endif47 48 #endif // !defined(BOOST_LOG_SETUP_BUILDING_THE_LIB) -
devel/boost/files/patch-tools-build-src-engine-build.jam.diff
diff --git a/devel/boost/files/patch-tools-build-src-engine-build.jam.diff b/devel/boost/files/patch-tools-build-src-engine-build.jam.diff index c70659e6da..60e9313203 100644
a b 1 --- tools/build/src/engine/build.jam.orig 2014-06-19 12:15:38.000000000 -05002 +++ tools/build/src/engine/build.jam 2014-08-14 07:43:48.000000000 -05003 @@ - 199,7 +199,7 @@1 --- tools/build/src/engine/build.jam.orig 2 +++ tools/build/src/engine/build.jam 3 @@ -206,7 +206,7 @@ 4 4 -I$(--python-include) -I$(--extra-include) 5 5 : -L$(--python-lib[1]) -l$(--python-lib[2]) ; 6 6 ## MacOSX Darwin, using GCC 2.9.x, 3.x -
devel/boost/files/patch-tools-build-src-engine-build.sh.diff
diff --git a/devel/boost/files/patch-tools-build-src-engine-build.sh.diff b/devel/boost/files/patch-tools-build-src-engine-build.sh.diff index 2c6259d1df..bdee542f42 100644
a b 1 --- tools/build/src/engine/build.sh.orig 2014-06-19 12:15:38.000000000 -05002 +++ tools/build/src/engine/build.sh 2014-08-14 07:43:48.000000000 -05003 @@ -1 34,7 +134,7 @@1 --- tools/build/src/engine/build.sh.orig 2 +++ tools/build/src/engine/build.sh 3 @@ -154,7 +154,7 @@ 4 4 ;; 5 5 6 6 darwin) -
devel/boost/files/patch-tools-build-src-tools-python-2.jam.diff
diff --git a/devel/boost/files/patch-tools-build-src-tools-python-2.jam.diff b/devel/boost/files/patch-tools-build-src-tools-python-2.jam.diff index fe8bf49787..5170b30a33 100644
a b 1 --- tools/build/src/tools/python.jam.orig 2009-10-06 15:56:18.000000000 +02002 +++ tools/build/src/tools/python.jam 2009-10-06 15:53:48.000000000 +02003 @@ -5 46,6 +546,13 @@1 --- tools/build/src/tools/python.jam.orig 2 +++ tools/build/src/tools/python.jam 3 @@ -537,6 +537,13 @@ 4 4 libraries ?= $(default-library-path) ; 5 5 includes ?= $(default-include-path) ; 6 6 } -
devel/boost/files/patch-tools-build-src-tools-python.jam.diff
diff --git a/devel/boost/files/patch-tools-build-src-tools-python.jam.diff b/devel/boost/files/patch-tools-build-src-tools-python.jam.diff index 75ad7c0a4a..7d71def2fc 100644
a b 1 --- tools/build/src/tools/python.jam.orig 2009-10-06 15:56:18.000000000 +02002 +++ tools/build/src/tools/python.jam 2009-10-06 15:53:48.000000000 +02003 @@ -42 7,7 +427,7 @@1 --- tools/build/src/tools/python.jam.orig 2 +++ tools/build/src/tools/python.jam 3 @@ -426,7 +426,7 @@ 4 4 version ?= $(.version-countdown) ; 5 5 6 6 local prefix