Upgrade Boost (#6899)

This commit is contained in:
mehrdadn
2020-02-25 14:33:12 -08:00
committed by GitHub
parent 1ea05a2c08
commit 57b33f1bed
4 changed files with 7 additions and 53 deletions
+5 -10
View File
@@ -113,25 +113,20 @@ def ray_deps_setup():
# declaring it here allows us to avoid patching the latter.
name = "boost",
build_file = "@com_github_nelhage_rules_boost//:BUILD.boost",
sha256 = "da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf",
strip_prefix = "boost_1_68_0",
url = "https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz",
sha256 = "96b34f7468f26a141f6020efb813f1a2f3dfb9797ecf76a7d7cbd843cc95f5bd",
strip_prefix = "boost_1_71_0",
url = "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz",
patches = [
"//thirdparty/patches:boost-exception-no_warn_typeid_evaluated.patch",
# Prefer compiler intrinsics; they're faster & avoid linker issues
"//thirdparty/patches:boost-interlocked-prefer-intrinsics.patch",
# Backport Clang-Cl patch on Boost 1.69 to Boost <= 1.68:
# https://lists.boost.org/Archives/boost/2018/09/243420.php
"//thirdparty/patches:boost-type_traits-trivial_move.patch",
],
)
github_repository(
name = "com_github_nelhage_rules_boost",
# If you update the Boost version, remember to update the 'boost' rule.
commit = "df908358c605a7d5b8bbacde07afbaede5ac12cf",
commit = "5b53112431ef916381d6969f114727cc4f83960b",
remote = "https://github.com/nelhage/rules_boost",
sha256 = "3775c5ab217e0c9cc380f56e243a4d75fe6fee8eaee1447899eaa04c5d582cf1",
sha256 = "4481db75d1d25b4f043f17a6c2d5f963782e659ad5049e027146b5248d37bf6b",
patches = [
"//thirdparty/patches:rules_boost-undefine-boost_fallthrough.patch",
"//thirdparty/patches:rules_boost-windows-linkopts.patch",
+2 -1
View File
@@ -2,8 +2,9 @@
#define UNISTD_H
#include <getopt.h>
#include <io.h> // open/read/write/close
#include <process.h> // getpid
#include <io.h> // open/read/write/close
#ifndef EXTERN_C
#ifdef __cplusplus
#define EXTERN_C extern "C"
@@ -1,10 +0,0 @@
diff --git boost/detail/interlocked.hpp boost/detail/interlocked.hpp
--- boost/detail/interlocked.hpp
+++ boost/detail/interlocked.hpp
@@ -21,1 +21,1 @@
-#if defined( BOOST_USE_WINDOWS_H )
+#if 0
@@ -33,1 +33,1 @@
-#elif defined( BOOST_USE_INTRIN_H )
+#elif defined( BOOST_USE_INTRIN_H ) || defined(_WIN32)
--
-32
View File
@@ -1,32 +0,0 @@
From ad326841ecca3e1a31102d5ddaf4e82f55a13742 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Fri, 3 Aug 2018 18:31:46 +0100
Subject: [PATCH] Correct spelling of "__clang__" so that the headers compile
on clang/windows.
---
boost/type_traits/has_trivial_move_assign.hpp | 2 +-
boost/type_traits/has_trivial_move_constructor.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git boost/type_traits/has_trivial_move_assign.hpp boost/type_traits/has_trivial_move_assign.hpp
index 6d954ab..7b39269 100644
--- boost/type_traits/has_trivial_move_assign.hpp
+++ boost/type_traits/has_trivial_move_assign.hpp
@@ -27,4 +27,4 @@
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__) || defined(__clang__)
#include <boost/type_traits/is_assignable.hpp>
#include <boost/type_traits/is_volatile.hpp>
#endif
diff --git boost/type_traits/has_trivial_move_constructor.hpp boost/type_traits/has_trivial_move_constructor.hpp
index 5784f4b..2ecfc36 100644
--- boost/type_traits/has_trivial_move_constructor.hpp
+++ boost/type_traits/has_trivial_move_constructor.hpp
@@ -25,4 +25,4 @@
-#if defined(__GNUC__) || defined(__clang)
+#if defined(__GNUC__) || defined(__clang__)
#include <boost/type_traits/is_constructible.hpp>
#include <boost/type_traits/is_volatile.hpp>
#endif
--