me
/
guix
Archived
1
0
Fork 0

gnu: abseil-cpp: Add variant for C++11.

* gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): New procedure.
(abseil-cpp-cxxstd17): Use it.
(abseil-cpp-cxxstd11): New variable.
master
Ludovic Courtès 2023-04-20 15:53:01 +02:00
parent c0ac055918
commit 4a51c88da8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 3 deletions

View File

@ -2,7 +2,7 @@
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020, 2022 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019, 2020, 2022 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
@ -1091,14 +1091,22 @@ Google's C++ code base.")
`(cons* "-DABSL_BUILD_TESTING=ON" `(cons* "-DABSL_BUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) (delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
(define-public abseil-cpp-cxxstd17 (define (abseil-cpp-for-c++-standard version)
(let ((base abseil-cpp)) (let ((base abseil-cpp))
(hidden-package (hidden-package
(package/inherit base (package/inherit base
(arguments (arguments
(substitute-keyword-arguments (package-arguments base) (substitute-keyword-arguments (package-arguments base)
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons* "-DCMAKE_CXX_STANDARD=17" #$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?
(define-public abseil-cpp-cxxstd11
(abseil-cpp-for-c++-standard 11))
(define-public pegtl (define-public pegtl
(package (package