[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47972] [PATCH 2/6] gnu: Add snappy-with-clang6.
From: |
Ricardo Wurmus |
Subject: |
[bug#47972] [PATCH 2/6] gnu: Add snappy-with-clang6. |
Date: |
Fri, 23 Apr 2021 16:31:57 +0200 |
* gnu/packages/compression.scm (snappy-with-clang6): New variable.
---
gnu/packages/compression.scm | 37 +++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 37a7d230fe..2b1dfcfab1 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus
<rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus
<rekado@elephly.net>
;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner
<efraim@flashner.co.il>
@@ -76,6 +76,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages llvm)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl)
@@ -1132,6 +1133,40 @@ for most inputs, but the resulting compressed files are
anywhere from 20% to
100% bigger.")
(license license:asl2.0)))
+;; We need this for irods.
+(define-public snappy-with-clang6
+ (package
+ (inherit snappy)
+ (name "snappy-with-clang")
+ (arguments
+ `(#:configure-flags
+ '("-DBUILD_SHARED_LIBS=ON"
+ "-DCMAKE_CXX_COMPILER=clang++"
+ "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
+ "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gcc (assoc-ref inputs "gcc")))
+ (setenv "CPLUS_INCLUDE_PATH"
+ (string-join
+ (cons* (string-append (assoc-ref inputs
"libcxx+libcxxabi")
+ "/include/c++/v1")
+ ;; Hide GCC's C++ headers so that they do not
interfere with
+ ;; the Clang headers.
+ (delete (string-append gcc "/include/c++")
+ (string-split (getenv
"CPLUS_INCLUDE_PATH")
+ #\:)))
+ ":"))
+ (format #true
+ "environment variable `CPLUS_INCLUDE_PATH' changed to
~a~%"
+ (getenv "CPLUS_INCLUDE_PATH"))))))))
+ (native-inputs
+ `(("clang" ,clang-toolchain-6)
+ ("libcxx+libcxxabi" ,libcxx+libcxxabi-6)
+ ("libcxxabi" ,libcxxabi-6)))))
+
(define-public p7zip
(package
(name "p7zip")
--
2.31.1
- [bug#47972] Add irods., Ricardo Wurmus, 2021/04/23
- [bug#47972] [PATCH 1/6] gnu: Add boost-for-irods., Ricardo Wurmus, 2021/04/23
- [bug#47972] [PATCH 2/6] gnu: Add snappy-with-clang6.,
Ricardo Wurmus <=
- [bug#47972] [PATCH 3/6] gnu: Add nanodbc-for-irods., Ricardo Wurmus, 2021/04/23
- [bug#47972] [PATCH 4/6] gnu: Add fmt-for-irods., Ricardo Wurmus, 2021/04/23
- [bug#47972] [PATCH 5/6] gnu: Add irods., Ricardo Wurmus, 2021/04/23
- [bug#47972] [PATCH 6/6] gnu: Add irods-client-icommands., Ricardo Wurmus, 2021/04/23
- [bug#47972] [PATCH 1/6] gnu: Add boost-for-irods., Maxime Devos, 2021/04/24