From patchwork Tue Oct 24 19:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 55338 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 C79AC170E8; Tue, 24 Oct 2023 20:39:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 71F4316985 for ; Tue, 24 Oct 2023 20:39:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvNEl-0004G0-Ky; Tue, 24 Oct 2023 15:38:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvNEd-0004F0-US for guix-patches@gnu.org; Tue, 24 Oct 2023 15:38:44 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvNEW-0004xk-Ln for guix-patches@gnu.org; Tue, 24 Oct 2023 15:38:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvNF0-0004qG-Bt for guix-patches@gnu.org; Tue, 24 Oct 2023 15:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66733] [PATCH v2] gnu: abseil-cpp: Update to 20230802.1. References: <20231024192441.240355-1-code@greghogan.com> In-Reply-To: <20231024192441.240355-1-code@greghogan.com> Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 19:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66733 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66733@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 66733-submit@debbugs.gnu.org id=B66733.169817631818578 (code B ref 66733); Tue, 24 Oct 2023 19:39:02 +0000 Received: (at 66733) by debbugs.gnu.org; 24 Oct 2023 19:38:38 +0000 Received: from localhost ([127.0.0.1]:56685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNEb-0004pa-VE for submit@debbugs.gnu.org; Tue, 24 Oct 2023 15:38:38 -0400 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]:53303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNEY-0004pJ-Cy for 66733@debbugs.gnu.org; Tue, 24 Oct 2023 15:38:36 -0400 Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-6ce291b5df9so2973492a34.2 for <66733@debbugs.gnu.org>; Tue, 24 Oct 2023 12:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1698176278; x=1698781078; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=z6WVnuby/pZ/1pQmrxho8SkB5M5Uu+72unEy91+pQWk=; b=nvfNnowFsYKFhCfFcRJcb1ijcTZ0sCEo4c1wUSHaVL9xlso1Leb8pOeMhWeK1BVO5S f+DsrAgXRhVs1Yr6SWuMxlgA0zOpgnsv7vfd/5Jl9wotv1xmI4Ac+FBKhgmIvs+Lr6lT +Kfh0/81cnHXr2Db4ysYTuLWUR1qLUsF3s1DGx1zAh9dePkIH1b/UnEtA8vOdgAanyu1 3zqc3MJQSgNbaRQAmd716wNoCazuBscH6vYDuaVmDXGvhk/s5ZpWSQqhVevRsjB/FC5q a3jtlaWAeCqOp3K62wNjArLNV67CUxCfeCQ8BfzqJ9626gu99B4N9eCVFhUVEWeP9hoi zVgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698176278; x=1698781078; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=z6WVnuby/pZ/1pQmrxho8SkB5M5Uu+72unEy91+pQWk=; b=A38VqANFC8oLB+pKyZNGRPTgqXIkGQl8WbUE1Fc4aGNfwZ8IEaSElWRpgJjOpH1VzI oZRU3XTVHF0DV2Zdtf5GtpuFpj7EtRGMRlRDLE+0Wmkhlwz0MHoyT38rsMZSUcE2mSUQ sUwdJTvCOuNjMBVvoKpcgUAMlIGZf9u8NT22Sb1DG2Z7bzRSXCEUUimhIoRFm2lj4VRp gNxbVBmGKbH2QyRFriINfYoeH0jD96PYPloav+6OOIGaLdUgVZ7SAdXZKbTnrxNPXIeZ qSROidpOUrOu2FN6ZTw3CwqUE6WXF+X59Qc2TvaaK6PNEH0CnVgrjDc/4XRlhmd9UMnP prMA== X-Gm-Message-State: AOJu0Yww+PR3xymR2wH840xbDH5meBX5W3Qul7FW8g5eLuERI6FgPwdp pNT2S/lQjhR8xE3veykiHtRxNriVNVtVGM55e9M= X-Google-Smtp-Source: AGHT+IEVVJjCbcil7Adqbm+/mTEuFTpOYF+5riRA0c2b3ptlybLRXx8kHDXsq0S0FKb6Qc/lbibksA== X-Received: by 2002:a05:6830:168d:b0:6b9:a84a:a393 with SMTP id k13-20020a056830168d00b006b9a84aa393mr12802214otr.37.1698176278535; Tue, 24 Oct 2023 12:37:58 -0700 (PDT) Received: from ip-172-31-19-221.us-east-2.compute.internal (ec2-18-223-188-34.us-east-2.compute.amazonaws.com. [18.223.188.34]) by smtp.gmail.com with ESMTPSA id bq12-20020a05620a468c00b007678973eaa1sm3666232qkb.127.2023.10.24.12.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 12:37:58 -0700 (PDT) From: Greg Hogan Date: Tue, 24 Oct 2023 19:37:49 +0000 Message-ID: <20231024193756.253478-1-code@greghogan.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches v2: fix for wording in commit header. * gnu/packages/cpp.scm (abseil-cpp): Update to 20230802.1. [arguments]<#:phases>: Add phase to set timezone environment variable. * gnu/packages/cpp.scm (abseil-cpp-20220623.1): Keep old version. * gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): Accept package to inherit from. * gnu/packages/cpp.scm (abseil-cpp-cxxstd11, abseil-cpp-cxxstd17): Inherit from latest supported version. --- gnu/packages/cpp.scm | 50 ++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index cfeb1c009a..815442314f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1223,7 +1223,7 @@ (define-public abseil-cpp-20211102.0 ((#:configure-flags flags) #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags))))))) -(define-public abseil-cpp +(define-public abseil-cpp-20220623.1 (let ((base abseil-cpp-20200923.3)) (package (inherit base) @@ -1244,22 +1244,46 @@ (define-public abseil-cpp `(cons* "-DABSL_BUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) -(define (abseil-cpp-for-c++-standard version) - (let ((base abseil-cpp)) - (hidden-package - (package/inherit base - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:configure-flags flags) - #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" - (number->string version)) - #$flags)))))))) +(define-public abseil-cpp + (let ((base abseil-cpp-20220623.1)) + (package + (inherit base) + (name "abseil-cpp") + (version "20230802.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abseil/abseil-cpp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'check 'set-env-vars + (lambda* (#:key inputs #:allow-other-keys) + ;; absl_time_test requires this environment variable. + (setenv "TZDIR" (string-append (assoc-ref %build-inputs "source") + "/absl/time/internal/cctz/testdata/zoneinfo"))))))))))) + +(define (abseil-cpp-for-c++-standard base version) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" + (number->string version)) + #$flags))))))) (define-public abseil-cpp-cxxstd17 - (abseil-cpp-for-c++-standard 17)) ;XXX: the default with GCC 11? + (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11? (define-public abseil-cpp-cxxstd11 - (abseil-cpp-for-c++-standard 11)) + (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11 (define-public pegtl (package