From patchwork Fri Sep 24 16:32:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 33273 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AD24427BBE3; Fri, 24 Sep 2021 17:33:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CF3BC27BBE1 for ; Fri, 24 Sep 2021 17:33:14 +0100 (BST) Received: from localhost ([::1]:47638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTo8P-0004hS-Qy for patchwork@mira.cbaines.net; Fri, 24 Sep 2021 12:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTo8F-0004hC-08 for guix-patches@gnu.org; Fri, 24 Sep 2021 12:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTo8E-0003jb-PK for guix-patches@gnu.org; Fri, 24 Sep 2021 12:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTo8E-00055Z-JM for guix-patches@gnu.org; Fri, 24 Sep 2021 12:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50783] [PATCH staging] Update googletest and abseil-cpp Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Sep 2021 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50783@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163250114819502 (code B ref -1); Fri, 24 Sep 2021 16:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Sep 2021 16:32:28 +0000 Received: from localhost ([127.0.0.1]:59144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTo7f-00054T-Uy for submit@debbugs.gnu.org; Fri, 24 Sep 2021 12:32:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:50992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTo7b-00054H-EN for submit@debbugs.gnu.org; Fri, 24 Sep 2021 12:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTo7b-0004aK-1F for guix-patches@gnu.org; Fri, 24 Sep 2021 12:32:23 -0400 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]:44626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTo7X-0003Er-1m for guix-patches@gnu.org; Fri, 24 Sep 2021 12:32:22 -0400 Received: by mail-il1-x133.google.com with SMTP id x2so10966854ila.11 for ; Fri, 24 Sep 2021 09:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=CHBraEkst+4122QC3l2UDVbatD+FW35UY4NkSWrKWMM=; b=EBZBT3JT3tQIGx7YuNW8NOnHSQXAad2SOdJ7GRoL+RIglhn3DLizLGXWN3I69rtFVB nBNpQw9seAmnCTCnGIqd0juKQxppohIzMurd/JDA9bxxpPgSCynL88UPXrltGK7AC2FU KFZkU5O/8jcWpCaLL3EiBK2zmRj4KdYdRh96qtR5nnktTdPDzBhBTakagZfF5RJdaXBb mvAA1zDKJcwG1IIobah0DPuyDM7CE80b0N+M4iwMS6L+g+kr2VaWe/PsSLSDb7ypBL6O E8uPStTvaiEGKK3pgEg7OlMZ9ZKZU/Ps4I2RcMJ3MRGbfgYFn3SuaVHLlSN+PmJMPwsj yEgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=CHBraEkst+4122QC3l2UDVbatD+FW35UY4NkSWrKWMM=; b=LaaqL4Tb7rUXWqT20tITC9Hi56pgG2zIxMNywRrkK9qQKw5gtp8ZU0LXCgNup8Cuc+ TyqXJSBEhD1VIJdzI/3Fotuk3EljOlw0FiWifX9DT3MojKAkNYKe/E6cjihhI4Vp4Pfa s0qJGSKhhaQxo+SL20n56rOnl2rrvtFh2diKo6fEsKY4mHJzkEMnlXMDIisr3pOqjzdU wuBcmn7341ulLpYBL7wbDZCcpwHspj2rVfVkX6q/Y3wuoJYB/ZOGZUwHpces4bBp895F 3tR8Q/pVB4dsFKFp6DarpBmvSktWz+VaqGBy6f4/ZKWn0j37+kAQLlpDNfpFaLmzJZ5i aAtA== X-Gm-Message-State: AOAM533wcoh85fe+EjykHx8D6rNXq0R+lkaezk8iw6Iouw/6Qp9vowzd Ugfb6wAAnnI3IIbBUaYviP5jLd3ITo6FDcnWI0DOxP0U7FnO8cwTuiY= X-Google-Smtp-Source: ABdhPJwhciG1eKOSgpYL2v3kvmSyDo/HUyupcjcSVR0lAe1CbqSWUT/ArMrQ5mSaICpUxNfO1JqNdUuoaBoth//vwXw= X-Received: by 2002:a05:6e02:158c:: with SMTP id m12mr9269005ilu.64.1632501137335; Fri, 24 Sep 2021 09:32:17 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Fri, 24 Sep 2021 12:32:06 -0400 Message-ID: Received-SPF: none client-ip=2607:f8b0:4864:20::133; envelope-from=code@greghogan.com; helo=mail-il1-x133.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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(-) -- EXPECT_THAT(errno, Eq(ERANGE)); - } - }; - 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 From 9ef812ad1c7de0e0254af5ca75c8167b39bc67b1 Mon Sep 17 00:00:00 2001 From: Greg Hogan 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: ;; 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); - diff --git a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch b/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch deleted file mode 100644 index 726149b015..0000000000 --- a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch +++ /dev/null @@ -1,42 +0,0 @@ -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* NewStrErrorTable() { - } // namespace - - std::string StrError(int errnum) { -+ absl::base_internal::ErrnoSaver errno_saver; - static const auto* table = NewStrErrorTable(); - if (errnum >= 0 && errnum < static_cast(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])); - }