From 2c1ae441892da3a40cde3a7a796e97cbe9f1da2a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 1 Feb 2017 12:49:48 +0100 Subject: upload boost 1.63.0 Change-Id: I7f896bb9650f68626b4bcfe96c9c41fafeab436a Reviewed-on: https://gerrit.libreoffice.org/33827 Tested-by: Jenkins Reviewed-by: David Tardon --- download.lst | 4 +- external/boost/UnpackedTarball_boost.mk | 5 +- external/boost/boost.gcc47679.patch | 20 ++--- .../boost_1_59_0.property_tree.wreturn-type.patch | 21 +++--- .../boost/boost_1_60_0.android.undef.warning.patch | 16 ---- external/boost/boost_1_60_0.quadmath.patch | 86 ---------------------- external/boost/boost_1_60_0.undef.warning.patch | 63 ++++------------ external/boost/boost_1_63_0.undef.warning.patch.1 | 12 +++ external/boost/clang-cl.patch.0 | 33 --------- external/boost/rtti.patch.0 | 10 +-- 10 files changed, 56 insertions(+), 214 deletions(-) delete mode 100644 external/boost/boost_1_60_0.android.undef.warning.patch delete mode 100644 external/boost/boost_1_60_0.quadmath.patch create mode 100644 external/boost/boost_1_63_0.undef.warning.patch.1 diff --git a/download.lst b/download.lst index d5ecfcb194e9..7f48a49adf87 100644 --- a/download.lst +++ b/download.lst @@ -6,8 +6,8 @@ export APR_MD5SUM := 98492e965963f852ab29f9e61b2ad700 export APR_TARBALL := apr-1.5.2.tar.gz export APR_UTIL_MD5SUM := 866825c04da827c6e5f53daff5569f42 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz -export BOOST_MD5SUM := 65a840e1a0b13a558ff19eeb2c4f0cbe -export BOOST_TARBALL := boost_1_60_0.tar.bz2 +export BOOST_MD5SUM := 1c837ecd990bb022d07e7aab32b09847 +export BOOST_TARBALL := boost_1_63_0.tar.bz2 export BREAKPAD_TARBALL := breakpad.zip export BREAKPAD_MD5SUM := 415ce291aa6f2ee1d5db7b62bf62ade8 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 604f882d95b0..813e663c2a34 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -34,11 +34,8 @@ boost_patches += boost_1_59_0.property_tree.wreturn-type.patch boost_patches += clang-cl.patch.0 -# This patch was already applied upstream -# https://github.com/boostorg/math/commit/74ff2db959c5fa75bec770c41ed2951a740fe936 -boost_patches += boost_1_60_0.quadmath.patch boost_patches += boost_1_60_0.undef.warning.patch -boost_patches += boost_1_60_0.android.undef.warning.patch +boost_patches += boost_1_63_0.undef.warning.patch.1 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/external/boost/boost.gcc47679.patch b/external/boost/boost.gcc47679.patch index 06cbd0f10729..38a8be7a6975 100644 --- a/external/boost/boost.gcc47679.patch +++ b/external/boost/boost.gcc47679.patch @@ -1,16 +1,16 @@ -diff -ru boost.orig/boost/optional/optional.hpp boost/boost/optional/optional.hpp ---- foo/misc/boost.orig/boost/optional/optional.hpp 2015-07-18 11:27:36.168127029 +0200 -+++ foo/misc/boost/boost/optional/optional.hpp 2015-07-18 20:36:13.777997833 +0200 -@@ -53,6 +53,8 @@ - - #include +diff -ru boost.orig/boost/optional/detail/optional_aligned_storage.hpp boost/boost/optional/detail/optional_aligned_storage.hpp +--- foo/misc/boost.orig/boost/optional/detail/optional_aligned_storage.hpp 2015-07-18 11:27:36.168127029 +0200 ++++ foo/misc/boost/boost/optional/detail/optional_aligned_storage.hpp 2015-07-18 20:36:13.777997833 +0200 +@@ -14,6 +14,8 @@ + #ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP + #define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP +#include + - #if (defined BOOST_NO_CXX11_RVALUE_REFERENCES) || (defined BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES) - #define BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - #endif -@@ -134,6 +136,11 @@ + namespace boost { + + namespace optional_detail { +@@ -39,6 +41,11 @@ class aligned_storage public: diff --git a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch index bc718ef8fc23..1673e4bd8669 100644 --- a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch +++ b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch @@ -1,15 +1,14 @@ aka MSVC warning C4715: not all control paths return a value -diff -ru boost.org/boost/property_tree/detail/json_parser/standard_callbacks.hpp boost/boost/property_tree/detail/json_parser/standard_callbacks.hpp ---- foo/misc/boost.org/boost/property_tree/detail/json_parser/standard_callbacks.hpp 2015-07-07 14:20:48.000000000 +0200 -+++ foo/misc/boost/boost/property_tree/detail/json_parser/standard_callbacks.hpp 2015-07-22 08:35:07.764263463 +0200 +diff -ru boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp +--- foo/misc/boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp 2015-07-07 14:20:48.000000000 +0200 ++++ foo/misc/boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp 2015-07-22 08:35:07.764263463 +0200 @@ -128,7 +128,7 @@ - stack.pop_back(); - return new_tree(); } -- assert(false); -+ std::abort(); - } - string& new_value() { - if (stack.empty()) return new_tree().data(); - + case object: + default: +- BOOST_ASSERT(false); // must start with string, i.e. call new_value ++ std::abort(); + case key: { + l.t->push_back(std::make_pair(key_buffer, Ptree())); + l.k = object; diff --git a/external/boost/boost_1_60_0.android.undef.warning.patch b/external/boost/boost_1_60_0.android.undef.warning.patch deleted file mode 100644 index 35b46433362c..000000000000 --- a/external/boost/boost_1_60_0.android.undef.warning.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru boost.orig/boost/predef/hardware/simd/x86.h boost/boost/predef/hardware/simd/x86.h ---- a/b/boost.orig/boost/predef/hardware/simd/x86.h 2016-01-30 15:58:27.931804135 +0100 -+++ a/b/boost/boost/predef/hardware/simd/x86.h 2016-01-30 16:02:09.063801650 +0100 -@@ -99,10 +99,10 @@ - #if !defined(BOOST_HW_SIMD_X86) && defined(__SSE3__) - # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE3_VERSION - #endif --#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2) -+#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)) - # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE2_VERSION - #endif --#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1) -+#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1)) - # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE_VERSION - #endif - #if !defined(BOOST_HW_SIMD_X86) && defined(__MMX__) diff --git a/external/boost/boost_1_60_0.quadmath.patch b/external/boost/boost_1_60_0.quadmath.patch deleted file mode 100644 index 344de9a67102..000000000000 --- a/external/boost/boost_1_60_0.quadmath.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 74ff2db959c5fa75bec770c41ed2951a740fe936 Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Fri, 1 Jan 2016 16:49:48 +0000 -Subject: [PATCH] Change config to not use it at all if we don't - have __has_include as GCC may be configured with --disable-libquadmath but - still signal that it supports __float128 - ---- - include/boost/math/special_functions/fpclassify.hpp | 16 +++++++++++++--- - include/boost/math/tools/config.hpp | 12 ------------ - 2 files changed, 13 insertions(+), 15 deletions(-) - -diff --git a/include/boost/math/special_functions/fpclassify.hpp b/include/boost/math/special_functions/fpclassify.hpp -index 0a4e1ac..58fad13 100644 ---- foo/bar/include/boost/math/special_functions/fpclassify.hpp -+++ foo/bar/include/boost/math/special_functions/fpclassify.hpp -@@ -81,7 +81,12 @@ is used. - #include - #endif - #ifdef BOOST_MATH_USE_FLOAT128 -+#ifdef __has_include -+#if __has_include("quadmath.h") - #include "quadmath.h" -+#define BOOST_MATH_HAS_QUADMATH_H -+#endif -+#endif - #endif - - #ifdef BOOST_NO_STDC_NAMESPACE -@@ -124,9 +129,14 @@ inline bool is_nan_helper(T, const boost::false_type&) - { - return false; - } --#ifdef BOOST_MATH_USE_FLOAT128 -+#if defined(BOOST_MATH_USE_FLOAT128) -+#if defined(BOOST_MATH_HAS_QUADMATH_H) - inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); } - inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); } -+#else -+inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnan(static_cast(f)); } -+inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnan(static_cast(f)); } -+#endif - #endif - } - -@@ -519,7 +529,7 @@ inline bool (isinf)(long double x) - return detail::isinf_impl(static_cast(x), method()); - } - #endif --#ifdef BOOST_MATH_USE_FLOAT128 -+#if defined(BOOST_MATH_USE_FLOAT128) && defined(BOOST_MATH_HAS_QUADMATH_H) - template<> - inline bool (isinf)(__float128 x) - { -@@ -611,7 +621,7 @@ inline bool (isnan)(long double x) - return detail::isnan_impl(x, method()); - } - #endif --#ifdef BOOST_MATH_USE_FLOAT128 -+#if defined(BOOST_MATH_USE_FLOAT128) && defined(BOOST_MATH_HAS_QUADMATH_H) - template<> - inline bool (isnan)(__float128 x) - { -diff --git a/include/boost/math/tools/config.hpp b/include/boost/math/tools/config.hpp -index ffd0ab4..75d29b6 100644 ---- foo/bar/include/boost/math/tools/config.hpp -+++ foo/bar/include/boost/math/tools/config.hpp -@@ -265,18 +265,6 @@ - # define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##SUF - #endif - // --// Test whether to support __float128, if we don't have quadmath.h then this can't currently work: --// --#ifndef BOOST_MATH_USE_FLOAT128 --#ifdef __has_include --#if ! __has_include("quadmath.h") --#define BOOST_MATH_DISABLE_FLOAT128 --#endif --#elif !defined(BOOST_ARCH_X86) --#define BOOST_MATH_DISABLE_FLOAT128 --#endif --#endif --// - // And then the actual configuration: - // - #if defined(_GLIBCXX_USE_FLOAT128) && defined(BOOST_GCC) && !defined(__STRICT_ANSI__) \ diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch index 22eac09657d8..df72af63a424 100644 --- a/external/boost/boost_1_60_0.undef.warning.patch +++ b/external/boost/boost_1_60_0.undef.warning.patch @@ -1,48 +1,17 @@ -diff -ur boost.orig/boost/type_traits/is_constructible.hpp boost/boost/type_traits/is_constructible.hpp ---- a/b/boost.orig/boost/type_traits/is_constructible.hpp 2015-12-13 13:49:42.000000000 +0100 -+++ a/b/boost/boost/type_traits/is_constructible.hpp 2016-01-29 15:07:05.859781670 +0100 -@@ -12,7 +12,7 @@ - #include - #include +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 ++ ++#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 --#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500) -+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) - - #include - #include -diff -ur boost.orig/boost/type_traits/is_copy_constructible.hpp boost/boost/type_traits/is_copy_constructible.hpp ---- a/b/boost.orig/boost/type_traits/is_copy_constructible.hpp 2015-12-13 13:49:42.000000000 +0100 -+++ a/b/boost/boost/type_traits/is_copy_constructible.hpp 2016-01-29 15:06:48.839781861 +0100 -@@ -12,7 +12,7 @@ - #include - #include - --#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40900) -+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) - - #include - -diff -ur boost.orig/boost/type_traits/is_default_constructible.hpp boost/boost/type_traits/is_default_constructible.hpp ---- a/b/boost.orig/boost/type_traits/is_default_constructible.hpp 2015-12-13 13:49:42.000000000 +0100 -+++ a/b/boost/boost/type_traits/is_default_constructible.hpp 2016-01-29 15:07:43.427781248 +0100 -@@ -12,7 +12,7 @@ - #include - #include - --#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500) -+#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) - - #include - -diff -ur boost.orig/boost/type_traits/is_nothrow_move_constructible.hpp boost/boost/type_traits/is_nothrow_move_constructible.hpp ---- a/b/boost.orig/boost/type_traits/is_nothrow_move_constructible.hpp 2015-12-13 13:49:42.000000000 +0100 -+++ a/b/boost/boost/type_traits/is_nothrow_move_constructible.hpp 2016-01-29 15:05:06.191783015 +0100 -@@ -26,7 +26,7 @@ - template struct is_nothrow_move_constructible : public ::boost::false_type {}; - template struct is_nothrow_move_constructible : public ::boost::false_type{}; - --#elif !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_SFINAE_EXPR) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700) -+#elif !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_SFINAE_EXPR) - - #include - #include diff --git a/external/boost/boost_1_63_0.undef.warning.patch.1 b/external/boost/boost_1_63_0.undef.warning.patch.1 new file mode 100644 index 000000000000..2773138e2765 --- /dev/null +++ b/external/boost/boost_1_63_0.undef.warning.patch.1 @@ -0,0 +1,12 @@ +diff -up boost/boost/math/special_functions/fpclassify.hpp.dt boost/boost/math/special_functions/fpclassify.hpp +--- boost/boost/math/special_functions/fpclassify.hpp.dt 2017-02-03 07:59:18.805415876 +0100 ++++ boost/boost/math/special_functions/fpclassify.hpp 2017-02-03 08:00:45.046494362 +0100 +@@ -134,7 +134,7 @@ inline bool is_nan_helper(T, const boost + inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); } + inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); } + #elif defined(BOOST_GNU_STDLIB) && BOOST_GNU_STDLIB && \ +- _GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC ++ _GLIBCXX_USE_C99_MATH && (!defined(_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) || !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) + inline bool is_nan_helper(__float128 f, const boost::true_type&) { return std::isnan(static_cast(f)); } + inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast(f)); } + #else diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0 index 16fffb7b819d..85ce47b22dc3 100644 --- a/external/boost/clang-cl.patch.0 +++ b/external/boost/clang-cl.patch.0 @@ -101,39 +101,6 @@ //For compilers supporting auto-tss cleanup //with Boost.Threads lib, use Boost.Threads lib # define BOOST_THREAD_USE_LIB ---- boost/type_traits/has_nothrow_assign.hpp -+++ boost/type_traits/has_nothrow_assign.hpp -@@ -24,7 +24,7 @@ - #include - #endif - #endif --#if defined(__GNUC__) || defined(__SUNPRO_CC) -+#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined __clang__ - #include - #include - #include ---- boost/type_traits/has_nothrow_constructor.hpp -+++ boost/type_traits/has_nothrow_constructor.hpp -@@ -17,7 +17,7 @@ - #if defined(BOOST_MSVC) || defined(BOOST_INTEL) - #include - #endif --#if defined(__GNUC__ ) || defined(__SUNPRO_CC) -+#if defined(__GNUC__ ) || defined(__SUNPRO_CC) || defined __clang__ - #include - #endif - ---- boost/type_traits/has_trivial_destructor.hpp -+++ boost/type_traits/has_trivial_destructor.hpp -@@ -21,7 +21,7 @@ - #include - #endif - --#if defined(__GNUC__) || defined(__clang) || defined(__SUNPRO_CC) -+#if defined(__GNUC__) || defined(__clang__) || defined(__SUNPRO_CC) - #include - #endif - --- boost/typeof/typeof.hpp +++ boost/typeof/typeof.hpp @@ -49,7 +49,7 @@ diff --git a/external/boost/rtti.patch.0 b/external/boost/rtti.patch.0 index 09fc95ced444..104fd17989a1 100644 --- a/external/boost/rtti.patch.0 +++ b/external/boost/rtti.patch.0 @@ -3,14 +3,14 @@ Visible function type RTTI for Clang -fsanitize=function --- boost/function/function_base.hpp +++ boost/function/function_base.hpp @@ -97,7 +97,7 @@ - * object pointers, and a structure that resembles a bound - * member function pointer. - */ + } obj_ref; + }; + - union function_buffer + union BOOST_SYMBOL_VISIBLE function_buffer { - // For pointers to function objects - mutable void* obj_ptr; + // Type-specific union members + mutable function_buffer_members members; @@ -159,7 +159,7 @@ }; -- cgit