* [bug#45842] [PATCH] gnu: abseil-cpp: Update to 20200923.2.
@ 2021-01-13 15:12 Greg Hogan
[not found] ` <handler.45842.B.161055074532104.ack@debbugs.gnu.org>
0 siblings, 1 reply; 4+ messages in thread
From: Greg Hogan @ 2021-01-13 15:12 UTC (permalink / raw)
To: 45842
[-- Attachment #1.1: Type: text/plain, Size: 3950 bytes --]
From 0b40b3dd15d81dd9ad99f2542ff2be5a8706a8cf Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Fri, 8 Jan 2021 19:01:10 +0000
Subject: [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
diff --git a/gnu/local.mk b/gnu/local.mk
index 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.scm
index 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 back
the 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 back
the 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.patch
b/gnu/packages/patches/abseil-cpp-fix.patch
new file mode 100644
index 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 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.23.3
[-- Attachment #1.2: Type: text/html, Size: 6172 bytes --]
[-- Attachment #2: 0001-gnu-abseil-cpp-Update-to-20200923.2.patch --]
[-- Type: application/octet-stream, Size: 3867 bytes --]
From 0b40b3dd15d81dd9ad99f2542ff2be5a8706a8cf Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Fri, 8 Jan 2021 19:01:10 +0000
Subject: [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
diff --git a/gnu/local.mk b/gnu/local.mk
index 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.scm
index 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 back the 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 back the 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.patch b/gnu/packages/patches/abseil-cpp-fix.patch
new file mode 100644
index 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 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.23.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#45842] Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.)
[not found] ` <handler.45842.B.161055074532104.ack@debbugs.gnu.org>
@ 2021-02-01 14:14 ` Greg Hogan
2021-03-11 21:16 ` Greg Hogan
0 siblings, 1 reply; 4+ messages in thread
From: Greg Hogan @ 2021-02-01 14:14 UTC (permalink / raw)
To: 45842
[-- Attachment #1.1: Type: text/plain, Size: 4317 bytes --]
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 #1.2: Type: text/html, Size: 7064 bytes --]
[-- Attachment #2: 0001-gnu-abseil-cpp-Update-to-20200923.3.patch --]
[-- Type: application/octet-stream, Size: 3463 bytes --]
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#45842] Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.)
2021-02-01 14:14 ` [bug#45842] Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.) Greg Hogan
@ 2021-03-11 21:16 ` Greg Hogan
2021-03-22 17:06 ` [bug#45842] [PATCH] gnu: abseil-cpp: Update to 20200923.2 Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Greg Hogan @ 2021-03-11 21:16 UTC (permalink / raw)
To: 45842
[-- Attachment #1.1: Type: text/plain, Size: 4715 bytes --]
A second patch from an unreleased upstream commit, which for me is
necessary to build the first patch off Guix master.
On Mon, Feb 1, 2021 at 9:14 AM Greg Hogan <code@greghogan.com> wrote:
> 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 #1.2: Type: text/html, Size: 7511 bytes --]
[-- Attachment #2: 0001-gnu-abseil-cpp-Update-to-20200923.3.patch --]
[-- Type: application/octet-stream, Size: 3467 bytes --]
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.
---
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 a39c5d8592..3ee670d7ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -787,6 +787,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 ce9c9502ef..e659e378f9 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -678,7 +678,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
@@ -687,11 +687,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.2
[-- Attachment #3: 0002-gnu-abseil-cpp-Patch-sterror_test.patch --]
[-- Type: application/octet-stream, Size: 4640 bytes --]
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.
---
gnu/local.mk | 3 +-
gnu/packages/cpp.scm | 5 ++-
...p-fix.patch => abseil-cpp-fix-gtest.patch} | 0
.../abseil-cpp-fix-strerror_test.patch | 42 +++++++++++++++++++
4 files changed, 48 insertions(+), 2 deletions(-)
rename gnu/packages/patches/{abseil-cpp-fix.patch => abseil-cpp-fix-gtest.patch} (100%)
create mode 100644 gnu/packages/patches/abseil-cpp-fix-strerror_test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 3ee670d7ff..8ea8767347 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -787,7 +787,8 @@ 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/abseil-cpp-fix-gtest.patch \
+ %D%/packages/patches/abseil-cpp-fix-strerror_test.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 e659e378f9..7b8b4ce8b0 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -689,7 +689,10 @@ point and then, after each tween step, plugging back the result.")
(base32
"1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))
;; Remove after next googletest release and update.
- (patches (search-patches "abseil-cpp-fix.patch"))))
+ (patches
+ (search-patches
+ "abseil-cpp-fix-gtest.patch"
+ "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.patch b/gnu/packages/patches/abseil-cpp-fix-gtest.patch
similarity index 100%
rename from gnu/packages/patches/abseil-cpp-fix.patch
rename to gnu/packages/patches/abseil-cpp-fix-gtest.patch
diff --git a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch b/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch
new file mode 100644
index 0000000000..726149b015
--- /dev/null
+++ b/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch
@@ -0,0 +1,42 @@
+From e2b1bab19a782cb62bb010d1c2925ab7314fb113 Mon Sep 17 00:00:00 2001
+diff --git a/absl/base/internal/strerror.cc b/absl/base/internal/strerror.cc
+index d66ba120..0d6226fd 100644
+--- a/absl/base/internal/strerror.cc
++++ b/absl/base/internal/strerror.cc
+@@ -51,7 +51,6 @@ const char* StrErrorAdaptor(int errnum, char* buf, size_t buflen) {
+ }
+
+ std::string StrErrorInternal(int errnum) {
+- absl::base_internal::ErrnoSaver errno_saver;
+ char buf[100];
+ const char* str = StrErrorAdaptor(errnum, buf, sizeof buf);
+ if (*str == '\0') {
+@@ -76,6 +75,7 @@ std::array<std::string, kSysNerr>* NewStrErrorTable() {
+ } // namespace
+
+ std::string StrError(int errnum) {
++ absl::base_internal::ErrnoSaver errno_saver;
+ static const auto* table = NewStrErrorTable();
+ if (errnum >= 0 && errnum < static_cast<int>(table->size())) {
+ return (*table)[errnum];
+diff --git a/absl/base/internal/strerror_test.cc b/absl/base/internal/strerror_test.cc
+index a53da97f..e32d5b5c 100644
+--- a/absl/base/internal/strerror_test.cc
++++ b/absl/base/internal/strerror_test.cc
+@@ -62,12 +62,14 @@ TEST(StrErrorTest, MultipleThreads) {
+ ++counter;
+ errno = ERANGE;
+ const std::string value = absl::base_internal::StrError(i);
++ // EXPECT_* could change errno. Stash it first.
++ int check_err = errno;
++ EXPECT_THAT(check_err, Eq(ERANGE));
+ // Only the GNU implementation is guaranteed to provide the
+ // string "Unknown error nnn". POSIX doesn't say anything.
+ if (!absl::StartsWith(value, "Unknown error ")) {
+- EXPECT_THAT(absl::base_internal::StrError(i), Eq(expected_strings[i]));
++ EXPECT_THAT(value, Eq(expected_strings[i]));
+ }
+- EXPECT_THAT(errno, Eq(ERANGE));
+ }
+ };
+
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#45842] [PATCH] gnu: abseil-cpp: Update to 20200923.2.
2021-03-11 21:16 ` Greg Hogan
@ 2021-03-22 17:06 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2021-03-22 17:06 UTC (permalink / raw)
To: Greg Hogan; +Cc: 45842
Hi Greg,
Greg Hogan <code@greghogan.com> skribis:
> 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.
[...]
> 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’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-22 17:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-13 15:12 [bug#45842] [PATCH] gnu: abseil-cpp: Update to 20200923.2 Greg Hogan
[not found] ` <handler.45842.B.161055074532104.ack@debbugs.gnu.org>
2021-02-01 14:14 ` [bug#45842] Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.) Greg Hogan
2021-03-11 21:16 ` Greg Hogan
2021-03-22 17:06 ` [bug#45842] [PATCH] gnu: abseil-cpp: Update to 20200923.2 Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.