diff options
Diffstat (limited to 'gnu/packages/cpp.scm')
-rw-r--r-- | gnu/packages/cpp.scm | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3832b67aec..aac96f96a7 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2096,29 +2096,6 @@ augment the C++ standard library. The Abseil library code is collected from Google's C++ code base.") (license license:asl2.0))) -;; This is for grpc-for-python-grpcio; keep this in sync with its actual -;; requirements. -(define-public abseil-cpp-20211102.0 - (let ((base abseil-cpp-20200923.3)) - (package - (inherit base) - (name "abseil-cpp") - (version "20211102.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/abseil/abseil-cpp") - (commit "215105818dfde3174fe799600bb0f3cae233d0bf"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "028vlxpmh65kb7s0cpba38qcwk1abyn5br0ffhvvjjh97vld69di")))) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:tests? _ #false) #false) - ((#:configure-flags flags) - #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags))))))) - (define-public abseil-cpp-20220623 (let ((base abseil-cpp-20200923.3)) (package @@ -2202,6 +2179,15 @@ Google's C++ code base.") #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" (delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) +(define-public abseil-cpp-cxxstd17 + (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11? + +(define-public abseil-cpp-cxxstd11 + (abseil-cpp-for-c++-standard abseil-cpp-20220623 11)) ;last version on C++11 + +(define-public static-abseil-cpp + (make-static-abseil-cpp abseil-cpp)) + (define-public miniaudio (package (name "miniaudio") @@ -2262,15 +2248,6 @@ Google's C++ code base.") made up of a single source file and has no external dependencies.") (license license:expat))) -(define-public abseil-cpp-cxxstd17 - (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11? - -(define-public abseil-cpp-cxxstd11 - (abseil-cpp-for-c++-standard abseil-cpp-20220623 11)) ;last version on C++11 - -(define-public static-abseil-cpp - (make-static-abseil-cpp abseil-cpp)) - (define-public pegtl (package (name "pegtl") |