summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-04-02 19:34:18 -0400
committerPeter Foley <pefoley2@verizon.net>2013-04-02 21:40:41 -0400
commit73be49e5e8cea42bc1531e5374d61cbf8ae5dbbf (patch)
tree63d9b85b24e2f0c4e61d93466e4099170ee95d68 /boost
parentda5adeada29b51dd0a65582cff9f0913e556f770 (diff)
fix clang mismatched-tags warning in boost
Change-Id: I6a575b08f46d22fbba25f0fb92f4ef6074803069
Diffstat (limited to 'boost')
-rw-r--r--boost/UnpackedTarball_boost.mk2
-rw-r--r--boost/boost.6139.clang.patch10
2 files changed, 12 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 482bbfa26bda..e997266fb4ea 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -28,6 +28,8 @@ boost_patches += boost.mipsbackport.patch
boost_patches += boost.7551.unusedvars.patch
boost_patches += boost.4100.warnings.patch
boost_patches += boost.4510.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/6139
+boost_patches += boost.6139.clang.patch
#https://svn.boost.org/trac/boost/ticket/6940
boost_patches += boost.6940.glibc.patch
#https://svn.boost.org/trac/boost/ticket/7774
diff --git a/boost/boost.6139.clang.patch b/boost/boost.6139.clang.patch
new file mode 100644
index 000000000000..afa9a25c594b
--- /dev/null
+++ b/boost/boost.6139.clang.patch
@@ -0,0 +1,10 @@
+--- misc/build/boost/boost/detail/container_fwd.hpp 2013-04-02 19:13:58.744000000 -0400
++++ misc/build/boost/boost/detail/container_fwd.hpp 2013-04-02 19:23:13.504000000 -0400
+@@ -17,6 +17,7 @@
+ || ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
+ && (defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL))) \
+ || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
++ || __GLIBCXX__ >= 20070513 \
+ || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
+ || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
+