-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#22982) abseil: Add 20240116.1, remove old versions
* Add abseil 20240116.1 * Skip C++17 build on latest version with GCC 7 * Remove old "patch" versions * Convert compiler major version to int in v1 test package * Backport GCC7/C++17/filesystem fix * Revert GCC 7 hacks * Remove std::result_of workaround defines
- Loading branch information
Showing
5 changed files
with
82 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
recipes/abseil/all/patches/0003-absl-string-libm-20240116.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- a/absl/strings/CMakeLists.txt | ||
| +++ b/absl/strings/CMakeLists.txt | ||
| @@ -32,9 +32,12 @@ | ||
| PUBLIC | ||
| ) | ||
|
|
||
| +find_library(LIBM m) | ||
| absl_cc_library( | ||
| NAME | ||
| strings | ||
| + LINKOPTS | ||
| + $<$<BOOL:${LIBM}>:-lm> | ||
| HDRS | ||
| "ascii.h" | ||
| "charconv.h" |
53 changes: 53 additions & 0 deletions
53
recipes/abseil/all/patches/20240116.1-0001-fix-filesystem-include.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| From bb83aceacb554e79e7cd2404856f0be30bd00303 Mon Sep 17 00:00:00 2001 | ||
| From: Derek Mauro <dmauro@google.com> | ||
| Date: Tue, 12 Mar 2024 08:33:40 -0700 | ||
| Subject: [PATCH] Fix GCC7 C++17 build | ||
|
|
||
| GCC did not support <filesystem> until GCC8. | ||
|
|
||
| Fixes #1635 | ||
|
|
||
| PiperOrigin-RevId: 615051227 | ||
| Change-Id: If7cd5802ead40805b1ff1c3bdfc10ba6d2858ef0 | ||
| --- | ||
| absl/hash/hash_test.cc | 2 +- | ||
| absl/hash/internal/hash.h | 12 ++++++++++-- | ||
| 2 files changed, 11 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h | ||
| index f4a94f9129f..b7d89b01807 100644 | ||
| --- a/absl/hash/internal/hash.h | ||
| +++ b/absl/hash/internal/hash.h | ||
| @@ -24,6 +24,15 @@ | ||
| #include <TargetConditionals.h> | ||
| #endif | ||
|
|
||
| +#include "absl/base/config.h" | ||
| + | ||
| +// For feature testing and determining which headers can be included. | ||
| +#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L | ||
| +#include <version> | ||
| +#else | ||
| +#include <ciso646> | ||
| +#endif | ||
| + | ||
| #include <algorithm> | ||
| #include <array> | ||
| #include <bitset> | ||
| @@ -47,7 +56,6 @@ | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| -#include "absl/base/config.h" | ||
| #include "absl/base/internal/unaligned_access.h" | ||
| #include "absl/base/port.h" | ||
| #include "absl/container/fixed_array.h" | ||
| @@ -61,7 +69,7 @@ | ||
| #include "absl/types/variant.h" | ||
| #include "absl/utility/utility.h" | ||
|
|
||
| -#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L && \ | ||
| +#if defined(__cpp_lib_filesystem) && __cpp_lib_filesystem >= 201703L && \ | ||
| !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY) | ||
| #include <filesystem> // NOLINT | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,11 @@ | ||
| versions: | ||
| "20240116.1": | ||
| folder: all | ||
| "20230802.1": | ||
| folder: all | ||
| "20230125.3": | ||
| folder: all | ||
| "20230125.2": | ||
| folder: all | ||
| "20230125.1": | ||
| folder: all | ||
| "20230125.0": | ||
| folder: all | ||
| "20220623.1": | ||
| folder: all | ||
| "20220623.0": | ||
| folder: all | ||
| "20211102.0": | ||
| folder: all |