rediff patches

diff --git a/boost-1.54.0-mpi-unused_typedef.patch b/boost-1.54.0-mpi-unused_typedef.patch
index 3a01d61bfa0baf16dc44f9d3c083e5fafac47e02..ee39f32b5e23bd77a734995d3fc8708416614fbb 100644 (file)
--- a/boost-1.54.0-mpi-unused_typedef.patch
+++ b/boost-1.54.0-mpi-unused_typedef.patch
@@ -3,9 +3,9 @@ diff -urp boost_1_54_0-orig/libs/mpi/src/communicator.cpp boost_1_54_0/libs/mpi/
 +++ boost_1_54_0/libs/mpi/src/communicator.cpp 2013-07-23 00:50:40.722961078 +0200
 @@ -118,7 +118,6 @@ optional<status> communicator::iprobe(in
  
- status communicator::probe(int source, int tag) const
+ optional<status> communicator::iprobe(int source, int tag) const
  {
 -  typedef optional<status> result_type;
  
    status stat;
-   BOOST_MPI_CHECK_RESULT(MPI_Probe,
+   int flag;

diff --git a/boost-1.54.0-mpl-print.patch b/boost-1.54.0-mpl-print.patch
index cbd1493fab8a995f411965cd6aa531465603490a..ea56c09c3fbbbb2c8441d3eb8256e120570cb6ce 100644 (file)
--- a/boost-1.54.0-mpl-print.patch
+++ b/boost-1.54.0-mpl-print.patch
@@ -10,7 +10,7 @@ Index: boost/mpl/print.hpp
 +#endif
  {
  #if defined(__clang__)
-     const int m_x = 1 / (sizeof(T) - sizeof(T));
+ # pragma clang diagnostic push
 @@ -52,15 +52,14 @@
      enum { n = sizeof(T) + -1 };
  #elif defined(__MWERKS__)

diff --git a/boost-clean-gcc-flags.patch b/boost-clean-gcc-flags.patch
index 3f10843b558e45d84e83604d92da1a1336d47dd0..daa2712addd83d4c610e96134638d4a7ab23749f 100644 (file)
--- a/boost-clean-gcc-flags.patch
+++ b/boost-clean-gcc-flags.patch
@@ -26,7 +26,7 @@
  toolset.flags gcc.compile OPTIONS <inlining>off  : -fno-inline ;
  toolset.flags gcc.compile OPTIONS <inlining>on   : -Wno-inline ;
 @@ -637,8 +632,8 @@
- toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
+ toolset.flags gcc.compile OPTIONS <warnings>pedantic : -Wall -Wextra -pedantic ;
  toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
  
 -toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
@@ -34,8 +34,8 @@
 +toolset.flags gcc.compile OPTIONS <debug-symbols>on : ;
 +toolset.flags gcc.compile OPTIONS <profiling>on : ;
  
- toolset.flags gcc.compile.c++ OPTIONS <rtti>off : -fno-rtti ;
- toolset.flags gcc.compile.c++ OPTIONS <exception-handling>off : -fno-exceptions ;
+ toolset.flags gcc.compile OPTIONS <local-visibility>hidden : -fvisibility=hidden ;
+ toolset.flags gcc.compile.c++ OPTIONS <local-visibility>hidden : -fvisibility-inlines-hidden ;
 @@ -1069,7 +1064,7 @@
  # x86 and compatible
  # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.

diff --git a/boost-link.patch b/boost-link.patch
index 72f0867bf55cb7036b839b22cf65256e0e4a7ae8..f934349d8e20e4f325f8a1e22ff6de57bbb98ee3 100644 (file)
--- a/boost-link.patch
+++ b/boost-link.patch
@@ -17,4 +17,4 @@
 +            : $(usage-requirements) <library>python.lib
              ;
      }
-     
+ 

diff --git a/boost-python-abi_letters.patch b/boost-python-abi_letters.patch
index 7df3ee7047daa031324098c5feae2f2cdc1f6bba..7e256185f90a975309fe38ce614d0ed38ac86e41 100644 (file)
--- a/boost-python-abi_letters.patch
+++ b/boost-python-abi_letters.patch
@@ -49,8 +49,8 @@
      extension-suffix ?= "" ;
 +    abi-letters ?= "" ;
  
-     # Normalize and dissect any version number.
-     local major-minor ;
+     local cmds-to-try ;
+ 
 @@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
      }
      else