From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YIw4HOhyYmGuDAEAgWs5BA (envelope-from ) for ; Sun, 10 Oct 2021 06:58:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wWYWFuhyYmHqZgAAB5/wlQ (envelope-from ) for ; Sun, 10 Oct 2021 04:58:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5EA241F4A6 for ; Sun, 10 Oct 2021 06:58:15 +0200 (CEST) Received: from localhost ([::1]:49986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZQuc-0006zg-Fk for larch@yhetil.org; Sun, 10 Oct 2021 00:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZQuR-0006z1-7Q for guix-patches@gnu.org; Sun, 10 Oct 2021 00:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZQuQ-0001JF-JB for guix-patches@gnu.org; Sun, 10 Oct 2021 00:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZQuQ-0001LN-IS for guix-patches@gnu.org; Sun, 10 Oct 2021 00:58:02 -0400 Subject: bug#50783: [PATCH staging] Update googletest and abseil-cpp Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 10 Oct 2021 04:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 50783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Greg Hogan Cc: 50783-done@debbugs.gnu.org Mail-Followup-To: 50783@debbugs.gnu.org, maxim.cournoyer@gmail.com, code@greghogan.com Received: via spool by 50783-done@debbugs.gnu.org id=D50783.16338418445107 (code D ref 50783); Sun, 10 Oct 2021 04:58:02 +0000 Received: (at 50783-done) by debbugs.gnu.org; 10 Oct 2021 04:57:24 +0000 Received: from localhost ([127.0.0.1]:54329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZQto-0001KI-3q for submit@debbugs.gnu.org; Sun, 10 Oct 2021 00:57:24 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:39471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZQtl-0001K5-Tj for 50783-done@debbugs.gnu.org; Sun, 10 Oct 2021 00:57:22 -0400 Received: by mail-qt1-f178.google.com with SMTP id i1so12310697qtr.6 for <50783-done@debbugs.gnu.org>; Sat, 09 Oct 2021 21:57:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=R8DHTmulOupekN0icRFGGJEi+WVFtLSB2jaU87R0n34=; b=S0B0g1cgPSyXM3k6CBrlGP5tE6AhgrUxreW6lI3NrW072lTNnBccsRvOgoasxsWyqc TBV+7gRgrrSzUJTl7tkFSKDyZmTFa6cO8p1t3A8RmDOgSz31WvwOzfoIgHxf8DX+c9oy ZNdcNfsI3swxtPjdPp8Ao9PLQDyiQYCVBIQgQr8kQeyrYYOZQJWlSsPP8yZRMicMIsz5 iwTFDFSPkVP8kXUM+KGzyN84AXjf3zMkmUsQmmAomhLnq4aKsw7QROTbmP1bxFDvY8By MZk+WYL8cWkSxbSSUpLbwgAcMmi9COqRn16Ctg2hPe83Dy7SGEHyaLcODjgf/VK4RXe6 ry8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=R8DHTmulOupekN0icRFGGJEi+WVFtLSB2jaU87R0n34=; b=H50tDIU6EdVn8H8AF7lLFsIakFka9ksAir36F39LBUa9CysRzJni2r2lns+OrgLODU sP9XimNClZNASHWkBOd71pxd4m9tbW/UPXvqmMGV2oBSlsmN5IRkoai/CVcj3+c3va/n dziSNYwm17KCKYj1rx5YbXStvTbluHLFgGODE79ymB+0i37/X7Ec9hyn37tbAeVkZlDM 0nWC9mmOEUSAOhn46SS2g7TP8H5/RKQdgGzs82A0iGjaZqGfNYNMZDxdfhVoUPr3iDfZ nAKdOHArrWUMHFi/Lq8L+uw36+bX5lGXzTh40Y85iBumn2Vmyv4Tny0NJ01baauOmFy2 KVxQ== X-Gm-Message-State: AOAM533/U4onrwCrwmyzdvw3rYJTzxXVVdmHlBZ0M3Jwhq3IbyL4vxnx bMvrwgxfAEwjwNCxdJ6g+te4DyHcGtE= X-Google-Smtp-Source: ABdhPJyyYkGmslrzfEtylOlhW4aXFL2hch3jYuNioVFQhx47kEPVtiuqJLLhhJ4miH8oQ2LdNUA+yQ== X-Received: by 2002:ac8:7763:: with SMTP id h3mr7478102qtu.159.1633841836199; Sat, 09 Oct 2021 21:57:16 -0700 (PDT) Received: from hurd (dsl-10-136-160.b2b2c.ca. [72.10.136.160]) by smtp.gmail.com with ESMTPSA id m15sm2365068qka.95.2021.10.09.21.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Oct 2021 21:57:15 -0700 (PDT) From: Maxim Cournoyer References: Date: Sun, 10 Oct 2021 00:57:15 -0400 In-Reply-To: (Greg Hogan's message of "Fri, 24 Sep 2021 12:32:06 -0400") Message-ID: <87wnml1npw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633841895; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=R8DHTmulOupekN0icRFGGJEi+WVFtLSB2jaU87R0n34=; b=lJpGiBfceVmpVFmqCtkJbDKbZX8ox1pDrln1B0PTjtXbbrH+hA88H/8d1lMotJsClx6sfa 46vs4uI5egUttpuspU9cM1ODRan33vHgcEJ3WNvXXAsF3ByLLP+zU2umluosv7N6YPgb6z 53dN9dmkiwzGDoO5U7gO0B24fKMe5JZfPgHS1bvqNLJCuEHlgw1uOxiElda4HUp+3eIi+l TgcJ4n4wQxZMHBlwVnVZ07gDohsQL0tyXIHCxYt6V+RVZQzegcwBmpC4qin99ta0wDfP4/ geh4fmHY51IARQuOdBPkViNsxnvA0t3zZoRMKyrcUNJLvsvOXZg+DF89+1Z3FA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633841895; a=rsa-sha256; cv=none; b=WFeRJ9LFGeDl51mBaSzTDYmvCNqCEhIX4JAWRJydNFX0ezmEFh6L7fFUhW7R6GGp8TjK2V xrU52k1f9UUuZ1ntT+4B5+M+Vjl44JiRktQaK2qH1dTsQrzwwmaLlDDJZ/YWIHuM7gIAdQ 1cQ7x7Azm8wysQWH/7IP+0mlBEx0M76uy2SPnjrltW5tTjQRphcsSvVkmpcVXpBj221lAq GSUWgfBGdLynWnbpR7F+enc6cDq8/X2EV2cZ4Ny2FsfPMH9oRS95B6MdVIPXBS8AvdlntB 6+ie9VYcPw/P+Hif/4TZMwszkKNcqHPxbyQDXgS44EH4Y1tBC3Pu7tAn4NYBcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=S0B0g1cg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=S0B0g1cg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5EA241F4A6 X-Spam-Score: -1.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: ifztmzIqQmWo Hello Greg, Greg Hogan 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 > 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 > 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