From patchwork Tue Oct 24 19:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 55334 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 E328D170E8; Tue, 24 Oct 2023 20:25:57 +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=unavailable 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 D82D316FFB for ; Tue, 24 Oct 2023 20:25:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvN25-0001WI-3f; Tue, 24 Oct 2023 15:25:41 -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 1qvN21-0001Vw-KG for guix-patches@gnu.org; Tue, 24 Oct 2023 15:25:37 -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 1qvN1w-0002cs-3S for guix-patches@gnu.org; Tue, 24 Oct 2023 15:25:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvN2P-0004T5-Pa for guix-patches@gnu.org; Tue, 24 Oct 2023 15:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66733] [PATCH] gnu: abseil-cpp: Add to 20230802.1. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 19:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66733 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66733@debbugs.gnu.org Cc: Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169817552717121 (code B ref -1); Tue, 24 Oct 2023 19:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2023 19:25:27 +0000 Received: from localhost ([127.0.0.1]:56645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvN1q-0004S4-Fr for submit@debbugs.gnu.org; Tue, 24 Oct 2023 15:25:26 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvN1n-0004Ro-S5 for submit@debbugs.gnu.org; Tue, 24 Oct 2023 15:25:26 -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 1qvN1E-0001Sa-C5 for guix-patches@gnu.org; Tue, 24 Oct 2023 15:24:48 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvN1C-0002Jf-6q for guix-patches@gnu.org; Tue, 24 Oct 2023 15:24:48 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-66cfd874520so29697396d6.2 for ; Tue, 24 Oct 2023 12:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1698175485; x=1698780285; darn=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=qJPoc4JcG/SZV3eBYetfKIWxJLLJbolCgn4xED6bfiw=; b=eSsxzDjjXtY1SYUo9CApDN0cfTmTSRH/yZUucGDkQiBuml6TlPFbmGBbQmXvXJC4Px +FKhzhbBBQ9RsqLJa5b+LE0kXyYH/gO8ZknrwbLTED+cU6xDr/m8zqsYPJVeKtdxZyDg kPoX88rpJyi0aSreP0C1z6ADrjEJh1s5llqqIUfA2s48H1QICDbJdl8oALLBLeejseDf Jyxecdoi6YLDoLLNCpbBE1W87I8SkWzLH9Rq8S0K257Mbs5pQebZ8Nh5QAPU4hMBA4jh yJTp5oqwSGm1ryAlfPEQ+GSxuByrDjA0htFkNsGOfj4xH9qDcNytLGGfwOSfLQd5TmcF kBrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698175485; x=1698780285; 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=qJPoc4JcG/SZV3eBYetfKIWxJLLJbolCgn4xED6bfiw=; b=or7uw5uCFotzqrvTtSBDGrTym/2TLUNuZkENzzP+6sNOZmw7VYdpzCIk/JjkNFBeQ2 4FS8bsp1lt99Im4l1eQC01pBXJZ9cVfF3ClCviOKB0ZYqZfgfX0CxbvTaXVkL8JdfE4k oX3JBFx3aFWM2O4T7TCrtdot4Lsfy8Q0Tne5w7Gzql/0KhKtgCtdc3uLH8VnRJQsHKlW 5VYdNhRf1rQTvp4F67msTQU6ZwMuJDc87sSDTgJhaWL8nnvr+jvZAhO/okMBEe8d2C8t c86V+6OK4k/xEYf6Hi0KHztS8dPrfqupG3a84uOcUujBAwCdRCPOhev59E8gcN1W05B3 v6aQ== X-Gm-Message-State: AOJu0YyNFjI/vrhd80SSKmUfrL3rh3RHK1AlpR1PVmA6hXLiUXFMqUHo dpW+CeV/5f+Z8nfHIK3msibijlc3iC+TYSIgG+w= X-Google-Smtp-Source: AGHT+IGjFIw0ietuptsjEi2nKy9La0FmGccQp2w+qvyBNJ0k1gvIBz79m7muBZYMhoelGbpaBHWEzQ== X-Received: by 2002:a05:6214:519e:b0:66d:140a:18f3 with SMTP id kl30-20020a056214519e00b0066d140a18f3mr15251474qvb.45.1698175484802; Tue, 24 Oct 2023 12:24:44 -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 u4-20020a0cf1c4000000b00646e0411e8csm3813710qvl.30.2023.10.24.12.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 12:24:44 -0700 (PDT) From: Greg Hogan Date: Tue, 24 Oct 2023 19:23:41 +0000 Message-ID: <20231024192441.240355-1-code@greghogan.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::f32; envelope-from=code@greghogan.com; helo=mail-qv1-xf32.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, 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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