me/guix
Archived
1
0
Fork 0
Code Activity

gnu: botan: Use new style and G-Expressions.

Browse source 
* gnu/packages/crypto.scm (botan)[phases]: Adjust to use gexps.
{check}: Replace 'if' with 'when'.
[native-inputs]: Use new style.
This commit is contained in:
Maxim Cournoyer 2022-05-17 16:04:54 -04:00
parent 423a3a6b6a
commit 393bcc012f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/crypto.scm
View file

@ -23,6 +23,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2022 Allan Adair <allan@adair.no> ;;; Copyright © 2022 Allan Adair <allan@adair.no>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -956,38 +957,34 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
"0q2mzzg0a40prp9gwjk7d9fn8kwj6z2x6h6mzlm0hr6sxz7h0vp2")))) "0q2mzzg0a40prp9gwjk7d9fn8kwj6z2x6h6mzlm0hr6sxz7h0vp2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref %outputs "out"))
(lib (string-append out "/lib")))
;; Upstream tests and benchmarks with -O3. ;; Upstream tests and benchmarks with -O3.
(setenv "CXXFLAGS" "-O3") (setenv "CXXFLAGS" "-O3")
(invoke "python" "./configure.py" (invoke "python" "./configure.py"
(string-append "--prefix=" out) (string-append "--prefix=" #$output)
"--disable-static" "--disable-static"
;; Otherwise, the `botan` executable cannot find ;; Otherwise, the `botan` executable cannot find
;; libbotan. ;; libbotan.
(string-append "--ldflags=-Wl,-rpath=" lib) (string-append "--ldflags=-Wl,-rpath=" #$output "/lib")
"--with-os-feature=getentropy" "--with-os-feature=getentropy"
"--with-rst2man" "--with-rst2man"
;; Recommended by upstream ;; Recommended by upstream
"--with-zlib" "--with-bzip2" "--with-sqlite3")))) "--with-zlib" "--with-bzip2" "--with-sqlite3")))
(add-before 'check 'library-path-for-tests (add-before 'check 'library-path-for-tests
(lambda _ (setenv "LD_LIBRARY_PATH" (getcwd)))) (lambda _ (setenv "LD_LIBRARY_PATH" (getcwd))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(if tests? (when tests?
(invoke "./botan-test"))))))) (invoke "./botan-test")))))))
(native-inputs (native-inputs (list python-wrapper python-docutils))
`(("python" ,python-wrapper) (inputs (list sqlite bzip2 zlib))
("python-docutils" ,python-docutils)))
(inputs
(list sqlite bzip2 zlib))
(synopsis "Cryptographic library in C++11") (synopsis "Cryptographic library in C++11")
(description "Botan is a cryptography library, written in C++11, offering (description "Botan is a cryptography library, written in C++11, offering
the tools necessary to implement a range of practical systems, such as TLS/DTLS, the tools necessary to implement a range of practical systems, such as TLS/DTLS,