From patchwork Mon Nov 27 19:19:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 56863 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 0973027BBE9; Mon, 27 Nov 2023 19:20:11 +0000 (GMT) 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 4E73827BBE2 for ; Mon, 27 Nov 2023 19:20:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7h9D-0005Ht-7c; Mon, 27 Nov 2023 14:19:59 -0500 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 1r7h99-0005Hj-VQ for guix-patches@gnu.org; Mon, 27 Nov 2023 14:19:56 -0500 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 1r7h99-0006Jv-NS for guix-patches@gnu.org; Mon, 27 Nov 2023 14:19:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7h9G-0003ey-4F for guix-patches@gnu.org; Mon, 27 Nov 2023 14:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66733] [PATCH v3] 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: Mon, 27 Nov 2023 19:20: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.170111276614007 (code B ref 66733); Mon, 27 Nov 2023 19:20:02 +0000 Received: (at 66733) by debbugs.gnu.org; 27 Nov 2023 19:19:26 +0000 Received: from localhost ([127.0.0.1]:44809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7h8f-0003dq-OY for submit@debbugs.gnu.org; Mon, 27 Nov 2023 14:19:26 -0500 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:51592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7h8e-0003da-DC for 66733@debbugs.gnu.org; Mon, 27 Nov 2023 14:19:24 -0500 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-77d6b28aa9aso264889285a.3 for <66733@debbugs.gnu.org>; Mon, 27 Nov 2023 11:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1701112752; x=1701717552; 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=nI+uqTzQvKi21irQlE56A8GGa9/bqq5rrg9a19hICcM=; b=c+DHXlpbW8V630j300he5EHcQPu1oBix8I3/5pq4FXQsw5ShilrQtqpRIO2uSCxARt x3faXuG5N6Qtvg5iBM5e2MlH1vWVdsisfpKCaei77Ld5gnXTwRTRckgJAZ/V98dBzm2s Vo/cnu8P8RuVSdyzd+S58DTPe5fy9/7lleHEWU1+FuWpu1WOt7E7o/w8g39J4sfwmCUH g1WMgxm0Q1Hl8AtpDhUefO0bG9Cyn0btPiM+NJYDbxFoqgttUgivJpNMD0IZsSsN0lsl twItISMqYe2WzXKA4ddOa33wTi3jut4IV00KakBNOWjYlACI9yOpilLeXgUpNlTbM2Qs pDHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701112752; x=1701717552; 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=nI+uqTzQvKi21irQlE56A8GGa9/bqq5rrg9a19hICcM=; b=ScUZ6aLqhh91w4oKNMmbTsqWSsXUQrSI4CB32NZRjdiXWavleL0bycKclWIub7FReD qugPOokaZpnijJQ7ZzBTmmMlIXVsX0ocMcRE9ebCRUTPdcactCHfjLORXhPQvf7CBOWG chtO6asmJBesS+5emkCZbcbzfWYlJsXjFcrUWXJ/nrruHmDNOaNY6WF85WiqucQ+yuJ+ v7DW/kghtU5MSeHgy/I9AnC8iTxymV157/145hcMwsuY7rBDvu10yU60Q1p/tAIJwCvN 3fnQrZ+OqbUogTB1WwvAILiauIdsviZ9tB+NwWHrYnyeSjp7FSpA9TuA0vNFWTA7fEV6 SqPw== X-Gm-Message-State: AOJu0YxsuKooJkIjSNtiNcVHJZxh/AekmCZ4r3Z5SDaM/Ibt0yuB0axq ui2SX5gpQ6jXglvp6piAKqkFy4cnhOt7OJnaEPs= X-Google-Smtp-Source: AGHT+IEQ4tFH1ymtMQfR0EFwtNvJFQNrt2DdyYMrbS3Zj0aL9Q1s0i4NyeDo5JnxSBey9jmmPFeW1A== X-Received: by 2002:a05:6214:21ce:b0:67a:4f43:e12f with SMTP id d14-20020a05621421ce00b0067a4f43e12fmr3320443qvh.25.1701112752135; Mon, 27 Nov 2023 11:19:12 -0800 (PST) Received: from ip-172-31-16-52.us-east-2.compute.internal (ec2-3-141-183-131.us-east-2.compute.amazonaws.com. [3.141.183.131]) by smtp.gmail.com with ESMTPSA id y7-20020a0ce807000000b0067a24f5b432sm2783310qvn.62.2023.11.27.11.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 11:19:11 -0800 (PST) From: Greg Hogan Date: Mon, 27 Nov 2023 19:19:03 +0000 Message-Id: <20231127191903.96287-1-code@greghogan.com> X-Mailer: git-send-email 2.40.1 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 v3: rebase and fix for gexp per Ludo'. * 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 5e35a03254..2cfb89eb2c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1263,7 +1263,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) @@ -1284,16 +1284,40 @@ (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 #$(package-source base) + "/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 (make-static-abseil-cpp version) (let ((base abseil-cpp)) @@ -1306,10 +1330,10 @@ (define (make-static-abseil-cpp version) (delete "-DBUILD_SHARED_LIBS=ON" #$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 static-abseil-cpp (make-static-abseil-cpp abseil-cpp))