From patchwork Mon Feb 1 14:14:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 26809 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 0802827BC24; Mon, 1 Feb 2021 14:16:24 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL, 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 7A11427BC26 for ; Mon, 1 Feb 2021 14:16:22 +0000 (GMT) Received: from localhost ([::1]:44146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6a05-0002tw-Ka for patchwork@mira.cbaines.net; Mon, 01 Feb 2021 09:16:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6Zzr-0002tO-HA for guix-patches@gnu.org; Mon, 01 Feb 2021 09:16:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6Zzm-0007Gx-El for guix-patches@gnu.org; Mon, 01 Feb 2021 09:16:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6Zzm-00050T-Ah for guix-patches@gnu.org; Mon, 01 Feb 2021 09:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45842] Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.) Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45842@debbugs.gnu.org Received: via spool by 45842-submit@debbugs.gnu.org id=B45842.161218891419178 (code B ref 45842); Mon, 01 Feb 2021 14:16:02 +0000 Received: (at 45842) by debbugs.gnu.org; 1 Feb 2021 14:15:14 +0000 Received: from localhost ([127.0.0.1]:59424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Zyz-0004zG-Vc for submit@debbugs.gnu.org; Mon, 01 Feb 2021 09:15:14 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:40715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Zyx-0004yx-KG for 45842@debbugs.gnu.org; Mon, 01 Feb 2021 09:15:13 -0500 Received: by mail-wm1-f49.google.com with SMTP id c127so13298688wmf.5 for <45842@debbugs.gnu.org>; Mon, 01 Feb 2021 06:15:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=qd5IlzIYY2zdxiRqczmddhb4s6y+G2PjI6Uft7nRNHM=; b=MUJNlWc7YJeMUjWMkhHUWkWmSrM1YNVumj0edKszBpsQciwUOenswjrfT+e18s2ZeR 30ePNNvZpJdnFHm4+cG639/Yyngja6iyD+V8r1SducbFhhgGKdR5OlHi7gZ4dWITefW+ DGD7Fed42n0wMUsUU3JHiPkVjmmZEJj1GwLwEgk4bgER0Nje9hzXOqhM70oFH98zS95a 8wseZgnDYS3RL7k2ZnLsuDzdMYDBRm7C+ld0dk1wIulvI8ixkg2GvqaPpX7+qjh0Fy6l RfXiVIvKbdz1wS4X1y6FY8Ea5Gr3AtbWULpP3mjZ6qYalWWbgn85atJG4VIsptsY1jcQ EXFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=qd5IlzIYY2zdxiRqczmddhb4s6y+G2PjI6Uft7nRNHM=; b=thm3mFiDWlt7hcVH8qL30qRh6h1EecSFBq4b4pBULq0wQjndTe73Ry9yqvVr4J89zv krbRqsZiASLBVaOBEEn3RsmSkrAZALKpC2as+7R2fd8ygseWVDFYtutl75+kvehCSw+P CUPWRXCc6blg8uieAHget6RFguJKA1Att+rC/Z8f9KDH1w8Jks9TarwyA2eW8S2yE4AQ trZ0IZo7PG813v3jQPAxuzJ8OaicrWGSpA/3555hkTd03qH0zRuJ6f2HhuCPZBIyBrrY OWtV1E/fU1/7uae0o3lf85IbbKo4ajDzaO5zAb/J2gVPOtXDg0NvR3PnCFnHs3sJY/6u /Ing== X-Gm-Message-State: AOAM532R4SOgTXRzVVE4tqQJ6VJ5iaJkYwcZBNLFqDO9WE/Z+E5hbYRv vRLR6W5HQwn64NB1t4KL5SZ8wxtnkyWbplofjZPCiBBqQHAV9KSz X-Google-Smtp-Source: ABdhPJzqUVad3ePlS7YVnmRjgCCEuVTnM8gfbwMWvZUeGRFR3nRK6XO338poycqWR9z45kwz8BFEat5ez54mvzfcwbc= X-Received: by 2002:a1c:4e:: with SMTP id 75mr15420866wma.150.1612188905008; Mon, 01 Feb 2021 06:15:05 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Greg Hogan Date: Mon, 1 Feb 2021 09:14:54 -0500 Message-ID: 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 Another version bump. From 4153f16143405a4439cabe8c13f3b75440e1f1cc Mon Sep 17 00:00:00 2001 From: Greg Hogan 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 + 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 > 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 +