ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: abseil-cpp: Update to 20230802.1.

Browse source 
* 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.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I7c29e1cd980b04496000eeb038529cdc6f636cb7
This commit is contained in:
Greg Hogan 2023-11-27 19:19:03 +00:00 committed by Ludovic Courtès
parent 49c009aabb
commit af2735e874
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gnu/packages/cpp.scm
View file

@ -1263,7 +1263,7 @@ (define-public abseil-cpp-20211102.0
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags))))))) #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
(define-public abseil-cpp (define-public abseil-cpp-20220623.1
(let ((base abseil-cpp-20200923.3)) (let ((base abseil-cpp-20200923.3))
(package (package
(inherit base) (inherit base)
@ -1284,16 +1284,40 @@ (define-public abseil-cpp
`(cons* "-DABSL_BUILD_TESTING=ON" `(cons* "-DABSL_BUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) (delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
(define (abseil-cpp-for-c++-standard version) (define-public abseil-cpp
(let ((base abseil-cpp)) (let ((base abseil-cpp-20220623.1))
(hidden-package (package
(package/inherit base (inherit base)
(arguments (name "abseil-cpp")
(substitute-keyword-arguments (package-arguments base) (version "20230802.1")
((#:configure-flags flags) (source (origin
#~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" (method git-fetch)
(number->string version)) (uri (git-reference
#$flags)))))))) (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) (define (make-static-abseil-cpp version)
(let ((base abseil-cpp)) (let ((base abseil-cpp))
@ -1306,10 +1330,10 @@ (define (make-static-abseil-cpp version)
(delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) (delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
(define-public abseil-cpp-cxxstd17 (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 (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 (define-public static-abseil-cpp
(make-static-abseil-cpp abseil-cpp)) (make-static-abseil-cpp abseil-cpp))