[PATCH] gnu: abseil-cpp: Update to 20200923.2.

DoneSubmitted by Greg Hogan.
Details
2 participants
  • Greg Hogan
  • Ludovic Courtès
Owner
unassigned
Severity
normal
G
G
Greg Hogan wrote on 13 Jan 16:12 +0100
(address . guix-patches@gnu.org)
CA+3U0Z=vQ1h184WMVGKCMzptY7RJSt_7REj8X_UT_tUwOYaoPg@mail.gmail.com
From 0b40b3dd15d81dd9ad99f2542ff2be5a8706a8cf Mon Sep 17 00:00:00 2001From: Greg Hogan <code@greghogan.com>Date: Fri, 8 Jan 2021 19:01:10 +0000Subject: [PATCH] gnu: abseil-cpp: Update to 20200923.2.
* gnu/packages/cpp.scm (abseil-cpp): Update to 20200923.2.[arguments]: Enable external googletest.* gnu/packages/patches/abseil-cpp-fix.patch: New file.* gnu/local.mk (dist_patch_DATA): Register it.--- gnu/local.mk | 1 + gnu/packages/cpp.scm | 9 ++++++--- gnu/packages/patches/abseil-cpp-fix.patch | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/abseil-cpp-fix.patch
Toggle diff (80 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex bcf7ee0245..b98fa1f106 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -780,6 +780,7 @@ dist_patch_DATA = \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \+ %D%/packages/patches/abseil-cpp-fix.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scmindex 45d3faeafb..115b8ca1e6 100644--- a/gnu/packages/cpp.scm+++ b/gnu/packages/cpp.scm@@ -14,7 +14,7 @@ ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>-;;; Copyright © 2020 Greg Hogan <code@greghogan.com>+;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; ;;; This file is part of GNU Guix.@@ -603,7 +603,7 @@ point and then, after each tween step, plugging backthe result.") (define-public abseil-cpp (package (name "abseil-cpp")- (version "20200225.2")+ (version "20200923.2") (source (origin (method git-fetch) (uri (git-reference@@ -612,11 +612,14 @@ point and then, after each tween step, plugging backthe result.") (file-name (git-file-name name version)) (sha256 (base32- "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"))))+ "0r98aplfmvvq40hskv2ly6jfkh9r958wk50hzyfdqgh85rl29v0v"))+ ;; Remove after next googletest release and update.+ (patches (search-patches "abseil-cpp-fix.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" "-DABSL_RUN_TESTS=ON"+ "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" ;; Needed, else we get errors like: ;; ;; ld:CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:diff --git a/gnu/packages/patches/abseil-cpp-fix.patchb/gnu/packages/patches/abseil-cpp-fix.patchnew file mode 100644index 0000000000..86751c227b--- /dev/null+++ b/gnu/packages/patches/abseil-cpp-fix.patch@@ -0,0 +1,16 @@+The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added togoogletest+in commit 0b024bd9 on master. It has been used in an abseil-cpp releasebefore+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);+-- 2.23.3
Attachment: file
G
G
Greg Hogan wrote on 1 Feb 15:14 +0100
Re: bug#45842: Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.)
(address . 45842@debbugs.gnu.org)
CA+3U0Z=z+CNkR8Zv7N09kh7v0HJPyQnsV_Gj7mdDErjdK2Y+4A@mail.gmail.com
Another version bump.
From 4153f16143405a4439cabe8c13f3b75440e1f1cc Mon Sep 17 00:00:00 2001From: Greg Hogan <code@greghogan.com>Date: Mon, 1 Feb 2021 14:01:11 +0000Subject: [PATCH] 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.--- gnu/local.mk | 1 + gnu/packages/cpp.scm | 7 +++++-- gnu/packages/patches/abseil-cpp-fix.patch | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/abseil-cpp-fix.patch
Toggle diff (69 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex e93425f394..0dba1b5855 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -783,6 +783,7 @@ dist_patch_DATA = \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \+ %D%/packages/patches/abseil-cpp-fix.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scmindex ae47490755..438713c38a 100644--- a/gnu/packages/cpp.scm+++ b/gnu/packages/cpp.scm@@ -672,7 +672,7 @@ point and then, after each tween step, plugging backthe result.") (define-public abseil-cpp (package (name "abseil-cpp")- (version "20200225.2")+ (version "20200923.3") (source (origin (method git-fetch) (uri (git-reference@@ -681,11 +681,14 @@ point and then, after each tween step, plugging backthe result.") (file-name (git-file-name name version)) (sha256 (base32- "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"))))+ "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))+ ;; Remove after next googletest release and update.+ (patches (search-patches "abseil-cpp-fix.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" "-DABSL_RUN_TESTS=ON"+ "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" ;; Needed, else we get errors like: ;; ;; ld:CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:diff --git a/gnu/packages/patches/abseil-cpp-fix.patchb/gnu/packages/patches/abseil-cpp-fix.patchnew file mode 100644index 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 togoogletest+in commit 0b024bd9 on master. It has been used in an abseil-cpp releasebefore+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);+
--2.30.0
On Wed, Jan 13, 2021 at 10:13 AM GNU bug Tracking System <help-debbugs@gnu.org> wrote:
Toggle quote (22 lines)> Thank you for filing a new bug report with debbugs.gnu.org.>> This is an automatically generated reply to let you know your message> has been received.>> Your message is being forwarded to the package maintainers and other> interested parties for their attention; they will reply in due course.>> Your message has been sent to the package maintainer(s):> guix-patches@gnu.org>> If you wish to submit further information on this problem, please> send it to 45842@debbugs.gnu.org.>> Please do not send mail to help-debbugs@gnu.org unless you wish> to report a problem with the Bug-tracking system.>> --> 45842: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45842> GNU Bug Tracking System> Contact help-debbugs@gnu.org with problems>
Attachment: file
G
G
Greg Hogan wrote on 11 Mar 22:16 +0100
(address . 45842@debbugs.gnu.org)
CA+3U0Zn+Trkgw8oyfjrZ2VG6LAmTEHurG1sy7cGr0H5MqR8rXg@mail.gmail.com
A second patch from an unreleased upstream commit, which for me isnecessary to build the first patch off Guix master.
On Mon, Feb 1, 2021 at 9:14 AM Greg Hogan <code@greghogan.com> wrote:
Toggle quote (117 lines)> Another version bump.>> From 4153f16143405a4439cabe8c13f3b75440e1f1cc Mon Sep 17 00:00:00 2001> From: Greg Hogan <code@greghogan.com>> Date: Mon, 1 Feb 2021 14:01:11 +0000> Subject: [PATCH] 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.> ---> gnu/local.mk | 1 +> gnu/packages/cpp.scm | 7 +++++--> gnu/packages/patches/abseil-cpp-fix.patch | 16 ++++++++++++++++> 3 files changed, 22 insertions(+), 2 deletions(-)> create mode 100644 gnu/packages/patches/abseil-cpp-fix.patch>> diff --git a/gnu/local.mk b/gnu/local.mk> index e93425f394..0dba1b5855 100644> --- a/gnu/local.mk> +++ b/gnu/local.mk> @@ -783,6 +783,7 @@ dist_patch_DATA = \> %D%/packages/patches/abcl-fix-build-xml.patch \> %D%/packages/patches/ableton-link-system-libraries-debian.patch \> %D%/packages/patches/abiword-explictly-cast-bools.patch \> + %D%/packages/patches/abseil-cpp-fix.patch \> %D%/packages/patches/adb-add-libraries.patch \> %D%/packages/patches/aegis-constness-error.patch \> %D%/packages/patches/aegis-perl-tempdir1.patch \> diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm> index ae47490755..438713c38a 100644> --- a/gnu/packages/cpp.scm> +++ b/gnu/packages/cpp.scm> @@ -672,7 +672,7 @@ point and then, after each tween step, plugging back> the result.")> (define-public abseil-cpp> (package> (name "abseil-cpp")> - (version "20200225.2")> + (version "20200923.3")> (source (origin> (method git-fetch)> (uri (git-reference> @@ -681,11 +681,14 @@ point and then, after each tween step, plugging back> the result.")> (file-name (git-file-name name version))> (sha256> (base32> - "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"))))> + "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))> + ;; Remove after next googletest release and update.> + (patches (search-patches "abseil-cpp-fix.patch"))))> (build-system cmake-build-system)> (arguments> `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"> "-DABSL_RUN_TESTS=ON"> + "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"> ;; Needed, else we get errors like:> ;;> ;; ld:> CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:> 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);> +> --> 2.30.0>> On Wed, Jan 13, 2021 at 10:13 AM GNU bug Tracking System <> help-debbugs@gnu.org> wrote:>>> Thank you for filing a new bug report with debbugs.gnu.org.>>>> This is an automatically generated reply to let you know your message>> has been received.>>>> Your message is being forwarded to the package maintainers and other>> interested parties for their attention; they will reply in due course.>>>> Your message has been sent to the package maintainer(s):>> guix-patches@gnu.org>>>> If you wish to submit further information on this problem, please>> send it to 45842@debbugs.gnu.org.>>>> Please do not send mail to help-debbugs@gnu.org unless you wish>> to report a problem with the Bug-tracking system.>>>> -->> 45842: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45842>> GNU Bug Tracking System>> Contact help-debbugs@gnu.org with problems>>>
Attachment: file
L
L
Ludovic Courtès wrote on 22 Mar 18:06 +0100
Re: bug#45842: [PATCH] gnu: abseil-cpp: Update to 20200923.2.
(name . Greg Hogan)(address . code@greghogan.com)(address . 45842@debbugs.gnu.org)
87ft0nw22j.fsf_-_@gnu.org
Hi Greg,
Greg Hogan <code@greghogan.com> skribis:
Toggle quote (10 lines)> From 9d0a4d0d680ff116ca910ef5654690e12aa42ab2 Mon Sep 17 00:00:00 2001> From: Greg Hogan <code@greghogan.com>> Date: Mon, 1 Feb 2021 14:01:11 +0000> Subject: [PATCH 1/2] 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.
[...]
Toggle quote (10 lines)> From 9dee38402923238b77a0e9010eb0380849b840ae Mon Sep 17 00:00:00 2001> From: Greg Hogan <code@greghogan.com>> Date: Thu, 11 Mar 2021 20:53:15 +0000> Subject: [PATCH 2/2] gnu: abseil-cpp: Patch sterror_test.>> * gnu/packages/patches/abseil-cpp-fix-gtest.patch: Renamed file.> * gnu/packages/patches/abseil-cpp-fix-strerror_test.patch: New file.> * gnu/local.mk (dist_patch_DATA): Rename / add files.> * gnu/packages/cpp.scm (abseil-cpp)[source]: Use files.
Applied both, thanks!
Ludo’.
L
L
Ludovic Courtès wrote on 22 Mar 18:10 +0100
control message for bug #45842
(address . control@debbugs.gnu.org)
87eeg7w1uz.fsf@gnu.org
tags 45842 fixedclose 45842 quit
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 45842@debbugs.gnu.org