mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upload boost 1.63.0

Browse Source 
Change-Id: I7f896bb9650f68626b4bcfe96c9c41fafeab436a
Reviewed-on: https://gerrit.libreoffice.org/33827
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
2017-02-01 12:49:48 +01:00
parent 2942346c26
commit 2c1ae44189
10 changed files with 56 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
download.lst
View File

@@ -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

5
external/boost/UnpackedTarball_boost.mk vendored
View File

@@ -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))

20
external/boost/boost.gcc47679.patch vendored
View File

@@ -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 <boost/optional/optional_fwd.hpp>
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 <string.h>
+
#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:

21
external/boost/boost_1_59_0.property_tree.wreturn-type.patch vendored
View File

@@ -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;

16
external/boost/boost_1_60_0.android.undef.warning.patch vendored
View File

@@ -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__)

86
external/boost/boost_1_60_0.quadmath.patch vendored
View File

@@ -1,86 +0,0 @@
From 74ff2db959c5fa75bec770c41ed2951a740fe936 Mon Sep 17 00:00:00 2001
From: jzmaddock <jz.maddock@gmail.com>
Date: Fri, 1 Jan 2016 16:49:48 +0000
Subject: [PATCH] Change <quadmath.h> 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 <float.h>
#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<double>(f)); }
+inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnan(static_cast<double>(f)); }
+#endif
#endif
}
@@ -519,7 +529,7 @@ inline bool (isinf)(long double x)
return detail::isinf_impl(static_cast<value_type>(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__) \

63
external/boost/boost_1_60_0.undef.warning.patch vendored
View File

@@ -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 <boost/type_traits/integral_constant.hpp>
#include <boost/detail/workaround.hpp>
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 <boost/type_traits/is_destructible.hpp>
#include <boost/type_traits/is_default_constructible.hpp>
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 <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#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 <boost/type_traits/is_constructible.hpp>
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 <boost/type_traits/integral_constant.hpp>
#include <boost/detail/workaround.hpp>
-#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 <boost/type_traits/detail/yes_no_type.hpp>
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 <class T> struct is_nothrow_move_constructible<volatile T> : public ::boost::false_type {};
template <class T> struct is_nothrow_move_constructible<const volatile T> : 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 <boost/type_traits/declval.hpp>
#include <boost/utility/enable_if.hpp>

12
external/boost/boost_1_63_0.undef.warning.patch.1 vendored Normal file
View File

@@ -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<double>(f)); }
inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast<double>(f)); }
#else

33
external/boost/clang-cl.patch.0 vendored
View File

@@ -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 <boost/type_traits/remove_reference.hpp>
#endif
#endif
-#if defined(__GNUC__) || defined(__SUNPRO_CC)
+#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined __clang__
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/is_volatile.hpp>
#include <boost/type_traits/is_assignable.hpp>
--- 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 <boost/type_traits/has_trivial_constructor.hpp>
#endif
-#if defined(__GNUC__ ) || defined(__SUNPRO_CC)
+#if defined(__GNUC__ ) || defined(__SUNPRO_CC) || defined __clang__
#include <boost/type_traits/is_default_constructible.hpp>
#endif
--- boost/type_traits/has_trivial_destructor.hpp
+++ boost/type_traits/has_trivial_destructor.hpp
@@ -21,7 +21,7 @@
#include <boost/type_traits/is_same.hpp>
#endif
-#if defined(__GNUC__) || defined(__clang) || defined(__SUNPRO_CC)
+#if defined(__GNUC__) || defined(__clang__) || defined(__SUNPRO_CC)
#include <boost/type_traits/is_destructible.hpp>
#endif
--- boost/typeof/typeof.hpp
+++ boost/typeof/typeof.hpp
@@ -49,7 +49,7 @@

10
external/boost/rtti.patch.0 vendored
View File

@@ -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 @@
};