Received: (at 66733) by debbugs.gnu.org; 27 Nov 2023 19:19:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:19:26 2023
Received: from localhost ([127.0.0.1]:44809 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7h8f-0003dq-OY
for submit <at> 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 <code@HIDDEN>) id 1r7h8e-0003da-DC
for 66733 <at> 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 <at> 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 <code@HIDDEN>
To: 66733 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: abseil-cpp: Update to 20230802.1.
Date: Mon, 27 Nov 2023 19:19:03 +0000
Message-Id: <20231127191903.96287-1-code@HIDDEN>
X-Mailer: git-send-email 2.40.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 66733
Cc: Greg Hogan <code@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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))
--
2.40.1
guix-patches@HIDDEN:bug#66733; Package guix-patches.
Full text available.Received: (at 66733) by debbugs.gnu.org; 22 Nov 2023 14:42:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 22 09:42:02 2023 Received: from localhost ([127.0.0.1]:58550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r5oQL-0004Mo-2a for submit <at> debbugs.gnu.org; Wed, 22 Nov 2023 09:42:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1r5oQJ-0004Mc-C6 for 66733 <at> debbugs.gnu.org; Wed, 22 Nov 2023 09:41:51 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1r5oQA-0007Rq-NV; Wed, 22 Nov 2023 09:41:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=pGRIGJlWS1pJ0oZ2570bTLeXLwkZ/EijTLG+HiPuhu0=; b=WgOwR7JVcf/QoAiBPKxU X34SJzaYq6FQHkpIYAqc+o/jlPOq3AYfahH8rkjwvWJ0borbZSUx0DEWEvBil1R35zQXWVbhDbpzM Hvn43XeIUDL5xzYaS25YSqHKZJSfq5qvWiiFdjggPWgJOSeS9lBFJPT49lrSASwQ+HVZK18g1KfvW BXFYm0y8iIPLGvOwG1TaWT4m+G071e5mMxd3WBpzE16WOXT0AMqxJjg6lc1jh6iHYzARtiPYhyX1v 8OBmN9h19SRbm4K9BslegN/L1DVOBLEixOsScqYLRHRvzROEGSM6bY+ymCBomeO0mIukGjyiRkRHM 6tVY4U3Q43H++A==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Greg Hogan <code@HIDDEN> Subject: Re: [bug#66733] [PATCH v2] gnu: abseil-cpp: Update to 20230802.1. In-Reply-To: <20231024193756.253478-1-code@HIDDEN> (Greg Hogan's message of "Tue, 24 Oct 2023 19:37:49 +0000") References: <20231024192441.240355-1-code@HIDDEN> <20231024193756.253478-1-code@HIDDEN> Date: Wed, 22 Nov 2023 15:41:40 +0100 Message-ID: <87o7fllujf.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66733 Cc: 66733 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi, Greg Hogan <code@HIDDEN> skribis: > 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. [...] > + #~(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") This could be written like so: (setenv "TZDIR" (string-append #$(package-source this-package) =E2=80=A6)) or referring to =E2=80=98inputs=E2=80=99 rather than =E2=80=98%build-inputs= =E2=80=99. Apart from that, it LGTM=E2=80=A6 but time has passed and it no longer applies. :-/ Could you rebase it and resend? Thanks and apologies for the delay! Ludo=E2=80=99.
guix-patches@HIDDEN:bug#66733; Package guix-patches.
Full text available.
Received: (at 66733) by debbugs.gnu.org; 24 Oct 2023 19:38:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Oct 24 15:38:38 2023
Received: from localhost ([127.0.0.1]:56685 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qvNEb-0004pa-VE
for submit <at> 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 <code@HIDDEN>) id 1qvNEY-0004pJ-Cy
for 66733 <at> 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 <at> 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 <code@HIDDEN>
To: 66733 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: abseil-cpp: Update to 20230802.1.
Date: Tue, 24 Oct 2023 19:37:49 +0000
Message-ID: <20231024193756.253478-1-code@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66733
Cc: Greg Hogan <code@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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
--
2.41.0
guix-patches@HIDDEN:bug#66733; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 24 Oct 2023 19:25:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Oct 24 15:25:26 2023
Received: from localhost ([127.0.0.1]:56645 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qvN1q-0004S4-Fr
for submit <at> 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 <code@HIDDEN>) id 1qvN1n-0004Ro-S5
for submit <at> 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 <code@HIDDEN>)
id 1qvN1E-0001Sa-C5
for guix-patches@HIDDEN; 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 <code@HIDDEN>)
id 1qvN1C-0002Jf-6q
for guix-patches@HIDDEN; Tue, 24 Oct 2023 15:24:48 -0400
Received: by mail-qv1-xf32.google.com with SMTP id
6a1803df08f44-66cfd874520so29697396d6.2
for <guix-patches@HIDDEN>; 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 <code@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: abseil-cpp: Add to 20230802.1.
Date: Tue, 24 Oct 2023 19:23:41 +0000
Message-ID: <20231024192441.240355-1-code@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: none client-ip=2607:f8b0:4864:20::f32;
envelope-from=code@HIDDEN; 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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: submit
Cc: Greg Hogan <code@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
--
2.41.0
Greg Hogan <code@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#66733; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.