Ticket #50671: boost_1.61.0.diff

File boost_1.61.0.diff, 16.6 KB (added by wuyongwei@…, 8 years ago)

  • files/patch-tools-build-src-engine-build.sh.diff

     
    1 --- tools/build/src/engine/build.sh.orig        2014-06-19 12:15:38.000000000 -0500
    2 +++ tools/build/src/engine/build.sh     2014-08-14 07:43:48.000000000 -0500
    3 @@ -134,7 +134,7 @@
     1--- tools/build/src/engine/build.sh.orig
     2+++ tools/build/src/engine/build.sh
     3@@ -142,7 +142,7 @@
    44     ;;
    55 
    66     darwin)

  • files/patch-export_serialization_explicit_template_instantiations.diff

     
    9696 
    9797--- libs/serialization/src/binary_iarchive.cpp.orig
    9898+++ libs/serialization/src/binary_iarchive.cpp
    99 @@ -8,10 +8,14 @@
     99@@ -8,11 +8,15 @@
    100100 
    101101 //  See http://www.boost.org for updates, documentation, and revision history.
    102102 
    … …  
    105105+#pragma GCC visibility pop
    106106 
    107107 #define BOOST_ARCHIVE_SOURCE
     108 #include <boost/serialization/config.hpp>
    108109+#pragma GCC visibility push(default)
    109110 #include <boost/archive/binary_iarchive.hpp>
    110111+#pragma GCC visibility pop
    111112 #include <boost/archive/detail/archive_serializer_map.hpp>
    112113 
    113114 #include <boost/archive/impl/archive_serializer_map.ipp>
    114 @@ -22,14 +26,14 @@
     115@@ -23,14 +27,14 @@
    115116 namespace archive {
    116117 
    117118 // explicitly instantiate for this type of stream
    … …  
    132133     std::istream::traits_type
    133134--- libs/serialization/src/binary_oarchive.cpp.orig
    134135+++ libs/serialization/src/binary_oarchive.cpp
    135 @@ -8,10 +8,14 @@
     136@@ -8,11 +8,15 @@
    136137 
    137138 //  See http://www.boost.org for updates, documentation, and revision history.
    138139 
    … …  
    141142+#pragma GCC visibility pop
    142143 
    143144 #define BOOST_ARCHIVE_SOURCE
     145 #include <boost/serialization/config.hpp>
    144146+#pragma GCC visibility push(default)
    145147 #include <boost/archive/binary_oarchive.hpp>
    146148+#pragma GCC visibility pop
    147149 #include <boost/archive/detail/archive_serializer_map.hpp>
    148150 
    149151 // explicitly instantiate for this type of binary stream
    150 @@ -22,14 +26,14 @@
     152@@ -23,14 +27,14 @@
    151153 namespace boost {
    152154 namespace archive {
    153155 
    … …  
    268270 } // archive
    269271--- libs/serialization/src/text_iarchive.cpp.orig
    270272+++ libs/serialization/src/text_iarchive.cpp
    271 @@ -13,7 +13,9 @@
    272  #endif
     273@@ -14,7 +14,9 @@
    273274 
    274275 #define BOOST_ARCHIVE_SOURCE
     276 #include <boost/serialization/config.hpp>
    275277+#pragma GCC visibility push(default)
    276278 #include <boost/archive/text_iarchive.hpp>
    277279+#pragma GCC visibility pop
    278280 #include <boost/archive/detail/archive_serializer_map.hpp>
    279281 
    280282 // explicitly instantiate for this type of text stream
    281 @@ -24,9 +26,9 @@
     283@@ -25,9 +27,9 @@
    282284 namespace boost {
    283285 namespace archive {
    284286 
    … …  
    293295 } // namespace boost
    294296--- libs/serialization/src/text_oarchive.cpp.orig
    295297+++ libs/serialization/src/text_oarchive.cpp
    296 @@ -13,7 +13,9 @@
    297  #endif
     298@@ -14,7 +14,9 @@
    298299 
    299300 #define BOOST_ARCHIVE_SOURCE
     301 #include <boost/serialization/config.hpp>
    300302+#pragma GCC visibility push(default)
    301303 #include <boost/archive/text_oarchive.hpp>
    302304+#pragma GCC visibility pop
    303305 #include <boost/archive/detail/archive_serializer_map.hpp>
    304306 
    305307 // explicitly instantiate for this type of text stream
    306 @@ -25,9 +27,9 @@
     308@@ -26,9 +28,9 @@
    307309 namespace archive {
    308310 
    309311 //template class basic_text_oprimitive<std::ostream> ;
    … …  
    318320 } // namespace boost
    319321--- libs/serialization/src/text_wiarchive.cpp.orig
    320322+++ libs/serialization/src/text_wiarchive.cpp
    321 @@ -15,7 +15,9 @@
    322  #else
     323@@ -16,7 +16,9 @@
    323324 
    324325 #define BOOST_WARCHIVE_SOURCE
     326 #include <boost/serialization/config.hpp>
    325327+#pragma GCC visibility push(default)
    326328 #include <boost/archive/text_wiarchive.hpp>
    327329+#pragma GCC visibility pop
    328330 #include <boost/archive/detail/archive_serializer_map.hpp>
    329331 
    330332 // explicitly instantiate for this type of text stream
    331 @@ -26,9 +28,9 @@
     333@@ -27,9 +29,9 @@
    332334 namespace boost {
    333335 namespace archive {
    334336 
    … …  
    343345 } // namespace boost
    344346--- libs/serialization/src/text_woarchive.cpp.orig
    345347+++ libs/serialization/src/text_woarchive.cpp
    346 @@ -14,7 +14,9 @@
    347  #else
     348@@ -15,7 +15,9 @@
    348349 
    349350 #define BOOST_WARCHIVE_SOURCE
     351 #include <boost/serialization/config.hpp>
    350352+#pragma GCC visibility push(default)
    351353 #include <boost/archive/text_woarchive.hpp>
    352354+#pragma GCC visibility pop
    353355 #include <boost/archive/detail/archive_serializer_map.hpp>
    354356 
    355357 // explicitly instantiate for this type of text stream
    356 @@ -25,9 +27,9 @@
     358@@ -26,9 +28,9 @@
    357359 namespace boost {
    358360 namespace archive {
    359361 
    … …  
    368370 } // namespace boost
    369371--- libs/serialization/src/xml_grammar.cpp.orig
    370372+++ libs/serialization/src/xml_grammar.cpp
    371 @@ -13,7 +13,9 @@
    372  #endif
     373@@ -16,7 +16,9 @@
    373374 
    374375 #define BOOST_ARCHIVE_SOURCE
     376 #include <boost/serialization/config.hpp>
    375377+#pragma GCC visibility push(default)
    376378 #include <boost/archive/impl/basic_xml_grammar.hpp>
    377379+#pragma GCC visibility pop
    378380 
    379381 using namespace boost::spirit::classic;
    380382 
    381 @@ -66,7 +68,7 @@
     383@@ -67,7 +69,7 @@
    382384 namespace archive {
    383385 
    384386 // explicit instantiation of xml for 8 bit characters
    … …  
    389391 } // namespace boost
    390392--- libs/serialization/src/xml_iarchive.cpp.orig
    391393+++ 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 @@
    395395 
     396 #define BOOST_ARCHIVE_SOURCE
     397 #include <boost/serialization/config.hpp>
    396398+#pragma GCC visibility push(default)
    397399 #include <boost/archive/xml_iarchive.hpp>
    398400+#pragma GCC visibility pop
    399401 #include <boost/archive/detail/archive_serializer_map.hpp>
    400402 
    401403 // explicitly instantiate for this type of xml stream
    402 @@ -28,9 +30,9 @@
     404@@ -25,9 +27,9 @@
    403405 namespace boost {
    404406 namespace archive {
    405407 
    … …  
    414416 } // namespace boost
    415417--- libs/serialization/src/xml_oarchive.cpp.orig
    416418+++ libs/serialization/src/xml_oarchive.cpp
    417 @@ -13,7 +13,9 @@
    418  #endif
     419@@ -14,7 +14,9 @@
    419420 
    420421 #define BOOST_ARCHIVE_SOURCE
     422 #include <boost/serialization/config.hpp>
    421423+#pragma GCC visibility push(default)
    422424 #include <boost/archive/xml_oarchive.hpp>
    423425+#pragma GCC visibility pop
    424426 #include <boost/archive/detail/archive_serializer_map.hpp>
    425427 
    426428 // explicitly instantiate for this type of xml stream
    427 @@ -24,9 +26,9 @@
     429@@ -25,9 +27,9 @@
    428430 namespace boost {
    429431 namespace archive {
    430432 
    … …  
    439441 } // namespace boost
    440442--- libs/serialization/src/xml_wgrammar.cpp.orig
    441443+++ libs/serialization/src/xml_wgrammar.cpp
    442 @@ -15,7 +15,9 @@
    443  #else
     444@@ -16,7 +16,9 @@
    444445 
    445446 #define BOOST_WARCHIVE_SOURCE
     447 #include <boost/serialization/config.hpp>
    446448+#pragma GCC visibility push(default)
    447449 #include <boost/archive/impl/basic_xml_grammar.hpp>
    448450+#pragma GCC visibility pop
    … …  
    460462 } // namespace boost
    461463--- libs/serialization/src/xml_wiarchive.cpp.orig
    462464+++ libs/serialization/src/xml_wiarchive.cpp
    463 @@ -21,7 +21,9 @@
     465@@ -19,7 +19,9 @@
    464466 
    465467 #define BOOST_WARCHIVE_SOURCE
    466  
     468 #include <boost/serialization/config.hpp>
    467469+#pragma GCC visibility push(default)
    468470 #include <boost/archive/xml_wiarchive.hpp>
    469471+#pragma GCC visibility pop
    470472 #include <boost/archive/detail/archive_serializer_map.hpp>
    471473 
    472474 // explicitly instantiate for this type of xml stream
    473 @@ -32,9 +34,9 @@
     475@@ -30,9 +32,9 @@
    474476 namespace boost {
    475477 namespace archive {
    476478 
    … …  
    485487 } // namespace boost
    486488--- libs/serialization/src/xml_woarchive.cpp.orig
    487489+++ libs/serialization/src/xml_woarchive.cpp
    488 @@ -14,7 +14,9 @@
    489  #else
     490@@ -19,7 +19,9 @@
    490491 
    491492 #define BOOST_WARCHIVE_SOURCE
     493 #include <boost/serialization/config.hpp>
    492494+#pragma GCC visibility push(default)
    493495 #include <boost/archive/xml_woarchive.hpp>
    494496+#pragma GCC visibility pop
    495497 #include <boost/archive/detail/archive_serializer_map.hpp>
    496498 
    497499 // explicitly instantiate for this type of text stream
    498 @@ -25,9 +27,9 @@
     500@@ -30,9 +32,9 @@
    499501 namespace boost {
    500502 namespace archive {
    501503 
    … …  
    507509+template class BOOST_SYMBOL_VISIBLE xml_woarchive_impl<xml_woarchive> ;
    508510 
    509511 } // namespace archive
    510  } // namespace boost
    511  No newline at end of file
     512 } // namespace boost

  • files/patch-apple-clang-no-libcxx.diff

     
    11diff --git boost/config/compiler/clang.hpp boost/config/compiler/clang.hpp
    22--- boost/config/compiler/clang.hpp
    33+++ boost/config/compiler/clang.hpp
    4 @@ -199,10 +199,20 @@
    5  
    6  #if !__has_feature(cxx_inline_namespaces)
     4@@ -207,6 +207,16 @@
    75 #  define BOOST_NO_CXX11_INLINE_NAMESPACES
    86 #endif
    97 
    … …  
    2018 #if !__has_feature(cxx_override_control)
    2119 #  define BOOST_NO_CXX11_FINAL
    2220 #endif
    23  
    24  #if !(__has_feature(cxx_binary_literals) || __has_extension(cxx_binary_literals))
    2521diff --git boost/multi_index/detail/vartempl_support.hpp boost/multi_index/detail/vartempl_support.hpp
    2622--- boost/multi_index/detail/vartempl_support.hpp
    2723+++ boost/multi_index/detail/vartempl_support.hpp

  • files/patch-libs-mpi-build-Jamfile.v2.diff

     
    1 --- libs/mpi/build/Jamfile.v2.orig      2010-10-18 02:22:09.000000000 -0400
    2 +++ libs/mpi/build/Jamfile.v2   2010-11-23 13:28:09.000000000 -0500
     1--- libs/mpi/build/Jamfile.v2.orig
     2+++ libs/mpi/build/Jamfile.v2
    33@@ -68,6 +68,7 @@
    44     <link>shared:<define>BOOST_MPI_DYN_LINK=1
    55   : # Default build

  • files/patch-tools-build-src-tools-python-2.jam.diff

     
    1 --- tools/build/src/tools/python.jam.orig       2009-10-06 15:56:18.000000000 +0200
    2 +++ tools/build/src/tools/python.jam    2009-10-06 15:53:48.000000000 +0200
    3 @@ -546,6 +546,13 @@
     1--- tools/build/src/tools/python.jam.orig
     2+++ tools/build/src/tools/python.jam
     3@@ -537,6 +537,13 @@
    44         libraries ?= $(default-library-path) ;
    55         includes ?= $(default-include-path) ;
    66     }

  • files/patch-tools-build-src-tools-python.jam.diff

     
    1 --- tools/build/src/tools/python.jam.orig       2009-10-06 15:56:18.000000000 +0200
    2 +++ tools/build/src/tools/python.jam    2009-10-06 15:53:48.000000000 +0200
    3 @@ -427,7 +427,7 @@
     1--- tools/build/src/tools/python.jam.orig
     2+++ tools/build/src/tools/python.jam
     3@@ -426,7 +426,7 @@
    44     version ?= $(.version-countdown) ;
    55 
    66     local prefix

  • files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff

     
    1 Fix build on PowerPC
    2 https://svn.boost.org/trac/boost/ticket/11603
    3 https://github.com/boostorg/context/commit/8c60232f5f372be9a47e26dbf7f000e9c21cc4a2
    4 --- libs/context/src/asm/make_ppc32_sysv_macho_gas.S.orig
    5 +++ libs/context/src/asm/make_ppc32_sysv_macho_gas.S
    6 @@ -82,7 +82,7 @@ _make_fcontext:
    7      subi  r3, r3, 304
    8  
    9      ; third arg of make_fcontext() == address of context-function
    10 -    stw  r5, 236(%r3)
    11 +    stw  r5, 236(r3)
    12  
    13      ; load LR
    14      mflr  r0

  • files/patch-boost-python3.diff

     
    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
    43@@ -13,6 +13,10 @@
    54 #include <boost/mpi/python/serialize.hpp>
    65 #include <boost/mpi.hpp>
    … …  
    1211 namespace boost { namespace mpi { namespace python {
    1312 
    1413 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
    1816@@ -6,5 +6,5 @@
    1917     import mpi
    2018     sys.setdlopenflags(flags)

  • files/patch-tools-build-src-engine-build.jam.diff

     
    1 --- tools/build/src/engine/build.jam.orig       2014-06-19 12:15:38.000000000 -0500
    2 +++ tools/build/src/engine/build.jam    2014-08-14 07:43:48.000000000 -0500
    3 @@ -199,7 +199,7 @@
     1--- tools/build/src/engine/build.jam.orig
     2+++ tools/build/src/engine/build.jam
     3@@ -205,7 +205,7 @@
    44     -I$(--python-include) -I$(--extra-include)
    55     : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
    66 ## MacOSX Darwin, using GCC 2.9.x, 3.x

  • files/patch-log-setup-link.diff

     
    1 https://github.com/boostorg/log/pull/10
    2 https://github.com/crmoore/log/commit/870284ed31792708a6139925d00a0aadf46bf09f
    3 --- boost/log/detail/setup_config.hpp
    4 +++ boost/log/detail/setup_config.hpp
    5 @@ -30,11 +30,17 @@
    6  #        define BOOST_LOG_SETUP_DLL
    7  #   endif
    8  
    9 -#   if defined(BOOST_HAS_DECLSPEC) && defined(BOOST_LOG_SETUP_DLL)
    10 -#       define BOOST_LOG_SETUP_API __declspec(dllimport)
    11 -#   else
    12 +#   if defined(BOOST_LOG_SETUP_DLL)
    13 +#       if defined(BOOST_SYMBOL_IMPORT)
    14 +#           define BOOST_LOG_SETUP_API BOOST_SYMBOL_IMPORT
    15 +#       elif defined(BOOST_HAS_DECLSPEC)
    16 +#           define BOOST_LOG_SETUP_API __declspec(dllimport)
    17 +#       endif
    18 +#   endif
    19 +#   ifndef BOOST_LOG_SETUP_API
    20  #       define BOOST_LOG_SETUP_API
    21 -#   endif // defined(BOOST_HAS_DECLSPEC)
    22 +#   endif
    23 +
    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 -#   else
    36 -#       define BOOST_LOG_SETUP_API
    37 +#   if defined(BOOST_LOG_SETUP_DLL)
    38 +#       if defined(BOOST_SYMBOL_EXPORT)
    39 +#           define BOOST_LOG_SETUP_API BOOST_SYMBOL_EXPORT
    40 +#       elif defined(BOOST_HAS_DECLSPEC)
    41 +#           define BOOST_LOG_SETUP_API __declspec(dllexport)
    42 +#       endif
    43 +#   endif
    44 +#   ifndef BOOST_LOG_SETUP_API
    45 +#       define BOOST_LOG_SETUP_API BOOST_SYMBOL_VISIBLE
    46  #   endif
    47  
    48  #endif // !defined(BOOST_LOG_SETUP_BUILDING_THE_LIB)

  • Portfile

     
    66PortGroup       mpi 1.0
    77
    88name            boost
    9 version         1.59.0
    10 revision        2
     9version         1.61.0
    1110license         Boost-1
    1211categories      devel
    1312platforms       darwin
    … …  
    2625distname        ${name}_${distver}
    2726use_bzip2       yes
    2827
    29 checksums       rmd160  a106b3cd1dbda2323e5e84c7106cedee327db03c \
    30                 sha256  727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
     28checksums \
     29    rmd160  1ceb250fcece242b54a999dbadbe2f3f1922541b \
     30    sha256  a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640
    3131
    3232depends_lib     port:zlib \
    3333                port:expat \
    … …  
    4545
    4646patchfiles      patch-tools-build-src-engine-build.sh.diff \
    4747                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
     48                patch-apple-clang-no-libcxx.diff
    5149                # patch-apple-clang-no-libcxx.diff fixes a clang configuration
    5250                # error that occurs on OS X 10.7 and 10.8 due to the assumption
    5351                # that if clang is the compiler in use it must be using libc++.