diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-08 22:40:30 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-09 22:17:58 -0400 |
| commit | ce92aba5c762d6d5557c36eea93fefd25de5756c (patch) | |
| tree | 6869e5a19ffe2b837637ba2cdf1444ec1eb4ae08 /gnu/packages | |
| parent | fd980bbf2f554bbc2bdc1404498c62b8a846cbb0 (diff) | |
gnu: abseil-cpp: Remove googletest patch.
* gnu/packages/patches/abseil-cpp-fix-gtest.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/cpp.scm (abseil-cpp)[source]: Remove patch.
Co-authored-by: Greg Hogan <code@greghogan.com>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/cpp.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/abseil-cpp-fix-gtest.patch | 16 |
2 files changed, 1 insertions, 20 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4af71ba93a..207129cbf8 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -754,11 +754,8 @@ point and then, after each tween step, plugging back the result.") (sha256 (base32 "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl")) - ;; Remove after next googletest release and update. (patches - (search-patches - "abseil-cpp-fix-gtest.patch" - "abseil-cpp-fix-strerror_test.patch")))) + (search-patches "abseil-cpp-fix-strerror_test.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" diff --git a/gnu/packages/patches/abseil-cpp-fix-gtest.patch b/gnu/packages/patches/abseil-cpp-fix-gtest.patch deleted file mode 100644 index 38971448f3..0000000000 --- a/gnu/packages/patches/abseil-cpp-fix-gtest.patch +++ /dev/null @@ -1,16 +0,0 @@ -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); - |