summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boost/UnpackedTarball_boost.mk1
-rw-r--r--boost/boost.std.move.patch20
2 files changed, 21 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 274781abd4f9..28ee031cadbe 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -40,6 +40,7 @@ boost_patches += boost_1_44_0-gcc4.8.patch
boost_patches += boost.4874.patch
boost_patches += boost.loplugin.patch
+boost_patches += boost.std.move.patch
boost_patches += boost.wundef.patch
boost_patches += boost.wshadow.patch
diff --git a/boost/boost.std.move.patch b/boost/boost.std.move.patch
new file mode 100644
index 000000000000..83badae6c60a
--- /dev/null
+++ b/boost/boost.std.move.patch
@@ -0,0 +1,20 @@
+--- foo/foo/foo/boost/config/compiler/clang.hpp
++++ foo/foo/foo/boost/config/compiler/clang.hpp
+@@ -8,6 +8,8 @@
+
+ // Clang compiler setup.
+
++#include <utility>
++
+ #if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
+ # define BOOST_NO_EXCEPTIONS
+ #endif
+@@ -108,7 +108,7 @@
+ # define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
+ #endif
+
+-#if !__has_feature(cxx_rvalue_references)
++#if !__has_feature(cxx_rvalue_references) || (defined(__APPLE__) && !defined(_LIBCPP_VERSION))
+ # define BOOST_NO_CXX11_RVALUE_REFERENCES
+ #endif
+