diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-18 17:00:55 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-18 21:33:34 +0200 |
commit | 9d837f19d1bf4cfbdee528e027f5b72d9b1da73d (patch) | |
tree | feda6fb7abf556827cf9985c0b5d63b5f1085b87 /external | |
parent | bdd797267b1e9e664b64e1c1525d1dde520a7063 (diff) |
Upgrade to Boost 1.65.1
...<https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2>.
One reason to upgrade is that with 1.63 CppunitTest_tools_test started to fail
with -fsanitize=signed-integer-overflow after
331e2e5ed3bf4e0b2c1fab3b7bca836170317827 "long->sal_Int32 in Fraction",
> workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:300:5: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
> #0 0x7f0f99bea71b in boost::integer::detail::gcd_optimal_evaluator<int>::operator()(int, int) const workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:300:5
> #1 0x7f0f99bea52a in int boost::integer::detail::gcd_optimal<int>(int const&, int const&) workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:372:16
> #2 0x7f0f99be7d70 in int boost::integer::gcd<int>(int const&, int const&) workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:435:12
> #3 0x7f0f99be7620 in boost::rational<int>::normalize() workdir/UnpackedTarball/boost/boost/rational.hpp:559:17
> #4 0x7f0f99bdff29 in rational_FromDouble(double) tools/source/generic/fract.cxx:449:12
> #5 0x7f0f99bdf8b4 in Fraction::Fraction(double) tools/source/generic/fract.cxx:93:25
> #6 0x7f0f9a1bb987 in tools::FractionTest::testMinLongDouble() tools/qa/cppunit/test_fract.cxx:79:18
> #7 0x7f0f9a1bddd2 in void std::_Bind<std::_Mem_fn<void (tools::FractionTest::*)()> (tools::FractionTest*)>::__call<void, , 0ul>(std::tuple<>&&, std::_Index_tuple<0ul>) /usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:933:11
> #8 0x7f0f9a1bdbe9 in void std::_Bind<std::_Mem_fn<void (tools::FractionTest::*)()> (tools::FractionTest*)>::operator()<, void>() /usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:991:17
> #9 0x7f0fa5eb53b0 in CppUnit::TestCaseMethodFunctor::operator()() const workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
> #10 0x7f0fa5e1bd1b in CppUnit::DefaultProtector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12
> #11 0x7f0fa5e8653d in CppUnit::ProtectorChain::ProtectFunctor::operator()() const workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
> #12 0x7f0fa5e7fb7c in CppUnit::ProtectorChain::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:86:18
> #13 0x7f0fa5f17fe0 in CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:182:28
> #14 0x7f0fa5eb398c in CppUnit::TestCase::run(CppUnit::TestResult*) workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:13
> #15 0x7f0fa5eb7887 in CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
> #16 0x7f0fa5eb6a78 in CppUnit::TestComposite::run(CppUnit::TestResult*) workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
> #17 0x7f0fa5eb7887 in CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
> #18 0x7f0fa5eb6a78 in CppUnit::TestComposite::run(CppUnit::TestResult*) workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
> #19 0x7f0fa5f46655 in CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:27
> #20 0x7f0fa5f16a66 in CppUnit::TestResult::runTest(CppUnit::Test*) workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:149:9
> #21 0x7f0fa5f475c6 in CppUnit::TestRunner::run(CppUnit::TestResult&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:96:14
> #22 0x534a01 in (anonymous namespace)::ProtectedFixtureFunctor::run() const sal/cppunittester/cppunittester.cxx:316:20
> #23 0x532ac4 in sal_main() sal/cppunittester/cppunittester.cxx:466:20
> #24 0x5324f2 in main sal/cppunittester/cppunittester.cxx:373:1
> #25 0x7f0fa436e430 in __libc_start_main /usr/src/debug/glibc-2.24-66-gd5a4092c36/csu/../csu/libc-start.c:289
> #26 0x4387b9 in _start (workdir/LinkTarget/Executable/cppunittester+0x4387b9)
Change-Id: Id1c3b216ee18c1d622768dc960ac257d5415c664
Reviewed-on: https://gerrit.libreoffice.org/42427
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 6 | ||||
-rw-r--r-- | external/boost/boost.type_index.Wundef.warnings.patch | 12 | ||||
-rw-r--r-- | external/boost/boost_1_60_0.undef.warning.patch | 13 | ||||
-rwxr-xr-x | external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 | 14 | ||||
-rw-r--r-- | external/boost/clang-cl.patch.0 | 11 |
5 files changed, 6 insertions, 50 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index d6c53401064f..4156bf7c3261 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -20,8 +20,6 @@ boost_patches += boost.multi_array.C4510.warnings.patch # https://svn.boost.org/trac/boost/ticket/9903 boost_patches += boost.utility.Wundef.warnings.patch -boost_patches += boost.type_index.Wundef.warnings.patch - boost_patches += boost.auto_link.patch boost_patches += boost.noiconv.patch @@ -39,10 +37,6 @@ boost_patches += clang-cl.patch.0 boost_patches += boost_1_60_0.undef.warning.patch boost_patches += boost_1_63_0.undef.warning.patch.1 -# Silence unknown-compiler-warning for MSVC version 19.11.25506: -# https://github.com/boostorg/config/pull/177/commits/a0147b73e8bde8f4b2c19c96166353dba8fa9914 -boost_patches += boost_1_63_0.msvs2017.3.warning.patch.1 - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/external/boost/boost.type_index.Wundef.warnings.patch b/external/boost/boost.type_index.Wundef.warnings.patch deleted file mode 100644 index c542924239b7..000000000000 --- a/external/boost/boost.type_index.Wundef.warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru boost.orig/boost/type_index/stl_type_index.hpp boost/boost/type_index/stl_type_index.hpp ---- foo/misc/boost.orig/boost/type_index/stl_type_index.hpp 2015-06-21 22:16:46.000000000 +0200 -+++ foo/misc/boost/boost/type_index/stl_type_index.hpp 2015-07-16 22:55:42.886944806 +0200 -@@ -174,7 +174,7 @@ - - - inline std::size_t stl_type_index::hash_code() const BOOST_NOEXCEPT { --#if _MSC_VER > 1600 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5 && defined(__GXX_EXPERIMENTAL_CXX0X__)) -+#if (defined(_MSC_VER) && _MSC_VER > 1600) || (__GNUC__ == 4 && __GNUC_MINOR__ > 5 && defined(__GXX_EXPERIMENTAL_CXX0X__)) - return data_->hash_code(); - #else - return boost::hash_range(raw_name(), raw_name() + std::strlen(raw_name())); diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch index df72af63a424..face1bbc4a3e 100644 --- a/external/boost/boost_1_60_0.undef.warning.patch +++ b/external/boost/boost_1_60_0.undef.warning.patch @@ -1,17 +1,16 @@ diff -ur boost.orig/boost/detail/workaround.hpp boost/boost/detail/workaround.hpp --- a/b/boost.orig/boost/detail/workaround.hpp 2015-12-13 13:49:42.000000000 +0100 +++ a/b/boost/boost/detail/workaround.hpp 2016-01-29 15:07:43.427781248 +0100 -@@ -227,6 +227,13 @@ - #else - #define BOOST_INTEL_WORKAROUND_GUARD 0 - #endif -+ +@@ -5,6 +5,12 @@ + #ifndef WORKAROUND_DWA2002126_HPP + #define WORKAROUND_DWA2002126_HPP + +#ifndef BOOST_GCC_VERSION +#define BOOST_GCC_VERSION_WORKAROUND_GUARD 1 +#else +#define BOOST_GCC_VERSION_WORKAROUND_GUARD 0 +#endif + - // Always define to zero, if it's used it'll be defined my MPL: - #define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0 + #include <boost/config/workaround.hpp> + #endif // WORKAROUND_DWA2002126_HPP diff --git a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 deleted file mode 100755 index 41557095a5e3..000000000000 --- a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru boost.orig/boost/config/compiler/visualc.hpp boost/boost/config/compiler/visualc.hpp ---- boost.orig/boost/config/compiler/visualc.hpp 2016-12-22 13:33:14.000000000 +0100 -+++ boost/boost/config/compiler/visualc.hpp 2017-09-05 21:33:16.462142600 +0200 -@@ -293,8 +293,8 @@ - #endif - - // --// last known and checked version is 19.10.24629 (VC++ 2017 RC): --#if (_MSC_VER > 1910) -+// last known and checked version is 19.11.25506 (VC++ 2017.3): -+#if (_MSC_VER > 1911) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0 index 85ce47b22dc3..6d07df7983fa 100644 --- a/external/boost/clang-cl.patch.0 +++ b/external/boost/clang-cl.patch.0 @@ -101,14 +101,3 @@ //For compilers supporting auto-tss cleanup //with Boost.Threads lib, use Boost.Threads lib # define BOOST_THREAD_USE_LIB ---- boost/typeof/typeof.hpp -+++ boost/typeof/typeof.hpp -@@ -49,7 +49,7 @@ - # endif - # endif - --#elif defined(__GNUC__) -+#elif defined(__GNUC__) || defined __clang__ - # ifndef BOOST_TYPEOF_EMULATION - # ifndef BOOST_TYPEOF_NATIVE - # define BOOST_TYPEOF_NATIVE |