diff options
author | Greg Hogan <code@greghogan.com> | 2021-02-01 14:01:11 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-19 22:17:03 +0100 |
commit | c4d616f7c665921e1329c75cd2d0cf05094b1306 (patch) | |
tree | c551da5dd7c5597c3eaced730b1a3ac3ce50b63f /gnu/packages/patches | |
parent | f08a60bbecc46b7918986bb79a34caf537751693 (diff) | |
download | guix-c4d616f7c665921e1329c75cd2d0cf05094b1306.tar.gz guix-c4d616f7c665921e1329c75cd2d0cf05094b1306.zip |
gnu: abseil-cpp: Update to 20200923.3.
* gnu/packages/cpp.scm (abseil-cpp): Update to 20200923.3.
[arguments]: Enable external googletest.
* gnu/packages/patches/abseil-cpp-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/abseil-cpp-fix.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gnu/packages/patches/abseil-cpp-fix.patch b/gnu/packages/patches/abseil-cpp-fix.patch new file mode 100644 index 0000000000..38971448f3 --- /dev/null +++ b/gnu/packages/patches/abseil-cpp-fix.patch @@ -0,0 +1,16 @@ +The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest +in commit 0b024bd9 on master. It has been used in an abseil-cpp release before +a googletest release. + +--- a/absl/container/internal/unordered_map_modifiers_test.h ++++ b/absl/container/internal/unordered_map_modifiers_test.h +@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : public ::testing::Test { + } + }; + ++#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST + GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest); ++#endif + + TYPED_TEST_SUITE_P(UniquePtrModifiersTest); + |