From patchwork Wed Jan 13 15:12:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 26345 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 E0F7C27BC11; Wed, 13 Jan 2021 15:13:10 +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 282A927BC10 for ; Wed, 13 Jan 2021 15:13:10 +0000 (GMT) Received: from localhost ([::1]:43278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzhpd-00057a-Bw for patchwork@mira.cbaines.net; Wed, 13 Jan 2021 10:13:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzhpW-000577-Ts for guix-patches@gnu.org; Wed, 13 Jan 2021 10:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52946) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzhpW-0007xZ-Lq for guix-patches@gnu.org; Wed, 13 Jan 2021 10:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kzhpW-0008Mk-Gd for guix-patches@gnu.org; Wed, 13 Jan 2021 10:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45842] [PATCH] gnu: abseil-cpp: Update to 20200923.2. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Jan 2021 15:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45842@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161055074532104 (code B ref -1); Wed, 13 Jan 2021 15:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2021 15:12:25 +0000 Received: from localhost ([127.0.0.1]:36259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzhor-0008Lf-16 for submit@debbugs.gnu.org; Wed, 13 Jan 2021 10:12:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:37396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzhoo-0008LX-LF for submit@debbugs.gnu.org; Wed, 13 Jan 2021 10:12:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzhoo-00054v-GV for guix-patches@gnu.org; Wed, 13 Jan 2021 10:12:18 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzhom-0007Y2-EV for guix-patches@gnu.org; Wed, 13 Jan 2021 10:12:18 -0500 Received: by mail-wr1-x431.google.com with SMTP id 91so2488420wrj.7 for ; Wed, 13 Jan 2021 07:12:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=zeWyqnKub0FspJvxSLnM+b1aFB/kkW9khWunys4RYHw=; b=mHANSthOcQ5ZrxRhw+OvPjRJkc5ldNxpQQYqcS/d/ktjCbAt0UHSu3Pcwe1MelDpps 9b4668BTV/tYRJSMHgGmGvO+LtSzZKtROFW9sEHHsWo6gRM8nv1NlLB9XdlC4paF2Iah tcXl3IvhXN2AcJD85zhTLFp9odJHROZBnh2YHSpqatmFYCpaF5cjZbcnMCjSl6kNgHme 1FNd2OCffmW8sagtGt14G37ALbPf5YDI+m45cszCOtc5FgjMV4ff6aGmVE6KshQvPZ+k 6W22QmJtyfr5SixOZ6FFPPbtWUMuLdeYLkfHFv6QHeotXZGOrP/ePJpy7Tj9DHvLkMJs GAqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=zeWyqnKub0FspJvxSLnM+b1aFB/kkW9khWunys4RYHw=; b=RjwsxvbgKKJP73yAwCEAEYWZ9fD+i9IUGYGVoscOXX+jkDPEXN722Qd4Y3vG7dgg1P 41WWqzGCLm1+E9nd0RsMhkGSrCkQVY+hK+ycW69ZCsmLR/Y7N8+R+70qHIljNNs5qYoD EZYuycTlKkS06CHz3TwB8O+xGZMmIjrbsh5M1Vr9BpRTAMLznMTbellCHhoc22PggIG/ U2e6nmawUj6FSLJ87z/8OXyYQm7rTmww9+mPNqb3qSd1inwKocFZ+GeYVuey2Z8Jy7kY nfuIPNoTTaaGsMvIIFp52PfmD0P8bAzDRZdafFWt9+HwnQCTo7H59PR5gKZPIkBEkkDh Zf2A== X-Gm-Message-State: AOAM532CgWNAhQ07oZjxsp48+fFRsF7JC/iEENdPbPH+S1xEB8o99KxD OgTeqJDD7Z9v0Ck/PSJdYGdOmyH27a890mIPGWXRU3x+4K4Y99j+FYw= X-Google-Smtp-Source: ABdhPJyabfscfLSzPJjz8QZcSVD/YbglaxDX3ll1QfnTedcwJnS2ZwNCpxg5jnZGJvcdJTkTtBp9mhDTPAkobNbl3BI= X-Received: by 2002:adf:fd05:: with SMTP id e5mr3104000wrr.225.1610550734304; Wed, 13 Jan 2021 07:12:14 -0800 (PST) MIME-Version: 1.0 From: Greg Hogan Date: Wed, 13 Jan 2021 10:12:03 -0500 Message-ID: Received-SPF: none client-ip=2a00:1450:4864:20::431; envelope-from=code@greghogan.com; helo=mail-wr1-x431.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 From 0b40b3dd15d81dd9ad99f2542ff2be5a8706a8cf Mon Sep 17 00:00:00 2001 From: Greg Hogan 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 + TYPED_TEST_SUITE_P(UniquePtrModifiersTest); + 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 ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Alexandros Theodotou -;;; Copyright © 2020 Greg Hogan +;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Brett Gilio ;;; ;;; 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 +