diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-cpp/abseil-cpp/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-cpp/abseil-cpp/files')
-rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch new file mode 100644 index 000000000000..45a9fc5406e8 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch @@ -0,0 +1,58 @@ +Fixes compile failure with CUDA nvcc +https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 +https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235 + +From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001 +From: Abseil Team <absl-team@google.com> +Date: Tue, 1 Feb 2022 13:52:49 -0800 +Subject: [PATCH] Export of internal Abseil changes + +-- +121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>: + +Internal change + +PiperOrigin-RevId: 425707805 + +-- +0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>: + +macOS CI: Avoid depending on external sites like GitHub by prepopulating +dependencies and setting --distdir + +Our Linux CI does this, but for some reason was never enabled on macOS + +PiperOrigin-RevId: 425668638 +GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35 +Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea +--- + absl/container/internal/inlined_vector.h | 8 ++++---- + ci/macos_xcode_bazel.sh | 10 +++++++++- + 2 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h +index cd34a413a..2baf26f3e 100644 +--- a/absl/container/internal/inlined_vector.h ++++ b/absl/container/internal/inlined_vector.h +@@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void { + inlined_ptr->GetSize()); + } + ABSL_INTERNAL_CATCH_ANY { +- allocated_ptr->SetAllocation( +- {allocated_storage_view.data, allocated_storage_view.capacity}); ++ allocated_ptr->SetAllocation(Allocation<A>{ ++ allocated_storage_view.data, allocated_storage_view.capacity}); + ABSL_INTERNAL_RETHROW; + } + +@@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void { + inlined_ptr->GetInlinedData(), + inlined_ptr->GetSize()); + +- inlined_ptr->SetAllocation( +- {allocated_storage_view.data, allocated_storage_view.capacity}); ++ inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data, ++ allocated_storage_view.capacity}); + } + + swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated()); |