Subject: Re: bug#50783: [PATCH staging] Update googletest and abseil-cpp

From: Maxim Cournoyer <[email-masked]>
Date: Sun, 10 Oct 2021 00:57:15 -0400

Hello Greg,

Greg Hogan <[email-masked]> writes:

> googletest has 350 dependent packages.
>
> abseil-cpp now requires a newer release of googletest.
>
>>>From cb6fbe064c34af02f60c30f8b00163ea1a74489b Mon Sep 17 00:00:00 2001
> From: Greg Hogan <[email-masked]>
> Date: Tue, 14 Sep 2021 13:19:29 +0000
> Subject: [PATCH 1/2] gnu: googletest: Update to 1.11.0.
>
> * gnu/packages/check.scm (googletest): Update to 1.11.0.
> ---
>  gnu/packages/check.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
> index b49f9de157..622aa5afa3 100644
> --- a/gnu/packages/check.scm
> +++ b/gnu/packages/check.scm
> @@ -676,7 +676,7 @@ test coverage and has a web user interface that will
> refresh automatically.")
>  (define-public googletest
>    (package
>      (name "googletest")
> -    (version "1.10.0")
> +    (version "1.11.0")
>      (source
>       (origin
>         (method git-fetch)
> @@ -685,7 +685,7 @@ test coverage and has a web user interface that will
> refresh automatically.")
>               (commit (string-append "release-" version))))
>         (file-name (git-file-name name version))
>         (sha256
> -        (base32 "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"))))
> +        (base32 "0pd4y1gpx1z8fiyarkvqlmk6hbv0lc8fr00ivnsvqzi1xg34jfaa"))))
>      (build-system cmake-build-system)
>      (arguments
>       `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
> -- 
>
> 2.33.0

Applied with fd980bbf2f.

>>>From 9ef812ad1c7de0e0254af5ca75c8167b39bc67b1 Mon Sep 17 00:00:00 2001
> From: Greg Hogan <[email-masked]>
> Date: Tue, 30 Mar 2021 13:16:22 +0000
> Subject: [PATCH 2/2] gnu: abseil-cpp: Update to 20210324.2.
>
> * gnu/packages/cpp.scm (abseil-cpp): Update to 20210324.2.
> [source]: Remove patches.
> [arguments]: Update configure flags.
> * gnu/packages/patches/abseil-cpp-fix.patch,
> gnu/packages/patches/abseil-cpp-fix-strerror_test.patch: Delete files.
> * gnu/local.mk (dist_patch_DATA): Deregister them.
> ---
>  gnu/local.mk                                  |  2 -
>  gnu/packages/cpp.scm                          | 11 ++---
>  .../patches/abseil-cpp-fix-gtest.patch        | 16 -------
>  .../abseil-cpp-fix-strerror_test.patch        | 42 -------------------
>  4 files changed, 3 insertions(+), 68 deletions(-)
>  delete mode 100644 gnu/packages/patches/abseil-cpp-fix-gtest.patch
>  delete mode 100644 gnu/packages/patches/abseil-cpp-fix-strerror_test.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 7d706f6f6e..6a1c1e209d 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -805,8 +805,6 @@ 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-gtest.patch \
> -  %D%/packages/patches/abseil-cpp-fix-strerror_test.patch \
>    %D%/packages/patches/adb-add-libraries.patch \
>    %D%/packages/patches/adb-libssl_11-compatibility.patch \
>    %D%/packages/patches/aegis-constness-error.patch         \
> diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
> index 4af71ba93a..40378f0499 100644
> --- a/gnu/packages/cpp.scm
> +++ b/gnu/packages/cpp.scm
> @@ -744,7 +744,7 @@ point and then, after each tween step, plugging back
> the result.")
>  (define-public abseil-cpp
>    (package
>      (name "abseil-cpp")
> -    (version "20200923.3")
> +    (version "20210324.2")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> @@ -753,16 +753,11 @@ point and then, after each tween step, plugging back
> the result.")
>                (file-name (git-file-name name version))
>                (sha256
>                 (base32
> -                "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))
> -              ;; Remove after next googletest release and update.
> -              (patches
> -               (search-patches
> -                "abseil-cpp-fix-gtest.patch"
> -                "abseil-cpp-fix-strerror_test.patch"))))
> +                "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x"))))
>      (build-system cmake-build-system)
>      (arguments
>       `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
> -                               "-DABSL_RUN_TESTS=ON"
> +                               "-DBUILD_TESTING=ON"
>                                 "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
>                                 ;; Needed, else we get errors like:
>                                 ;;

[...]

That one gave me a bit of trouble: I noticed by running one of the
dependents (python-keras) that it had caused tensorflow to malfunction.
I ended up keeping the older variant around; you can see what was done
in commit 302a9111df.

Thanks!

Closing.

Maxim