From: Greg Hogan <code@greghogan.com>
To: 66733@debbugs.gnu.org
Cc: Greg Hogan <code@greghogan.com>
Subject: [bug#66733] [PATCH] gnu: abseil-cpp: Add to 20230802.1.
Date: Tue, 24 Oct 2023 19:23:41 +0000 [thread overview]
Message-ID: <20231024192441.240355-1-code@greghogan.com> (raw)
* 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
next reply other threads:[~2023-10-24 19:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 19:23 Greg Hogan [this message]
2023-10-24 19:37 ` [bug#66733] [PATCH v2] gnu: abseil-cpp: Update to 20230802.1 Greg Hogan
2023-11-22 14:41 ` Ludovic Courtès
2023-11-27 19:19 ` [bug#66733] [PATCH v3] " Greg Hogan
2023-12-04 20:55 ` bug#66733: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231024192441.240355-1-code@greghogan.com \
--to=code@greghogan.com \
--cc=66733@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.