summaryrefslogtreecommitdiff
path: root/external/boost
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-07 17:49:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-07 17:49:52 +0100
commite52948e7b735dc834d8d6b5fa9c5e72318c1dd9e (patch)
tree32ced47a37bdbe0d2f87d7ec89347c545f245891 /external/boost
parent43a0bae9f6563afb441490b2d54166e6c926d063 (diff)
external/boost: Work around -fsanitize=bool
Change-Id: I4a34c2ced30770dace39ffd39a530f719174ca7e
Diffstat (limited to 'external/boost')
-rw-r--r--external/boost/UnpackedTarball_boost.mk2
-rw-r--r--external/boost/ubsan.patch.011
2 files changed, 13 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 3a760fd2263d..09295d0274a6 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -107,6 +107,8 @@ boost_patches += boost.signal2.Wshadow.warnings.patch
boost_patches += boost.boost_static_assert_unused_attribute.patch.0
boost_patches += w4702.patch.0
+boost_patches += ubsan.patch.0
+
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
$(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/ubsan.patch.0 b/external/boost/ubsan.patch.0
new file mode 100644
index 000000000000..5f378c0b749e
--- /dev/null
+++ b/external/boost/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- boost/algorithm/string/find_iterator.hpp
++++ boost/algorithm/string/find_iterator.hpp
+@@ -240,7 +240,7 @@
+ m_Match(Other.m_Match),
+ m_Next(Other.m_Next),
+ m_End(Other.m_End),
+- m_bEof(Other.m_bEof)
++ m_bEof(Other.eof())
+ {}
+
+ //! Constructor