gnu: mbedtls-for-hiawatha: Use inherited source.
* gnu/packages/tls.scm (mbedtls-for-hiawatha): Use inherited source. [arguments]<#:phases>: Keep "-Wformat-signedness". Change-Id: I562ae6533b518a853b9b59f8fb69c0135364277fmaster
parent
abeffc8237
commit
8dfaf461b4
|
@ -978,8 +978,6 @@ number generator")
|
||||||
(define-public mbedtls-apache
|
(define-public mbedtls-apache
|
||||||
(package
|
(package
|
||||||
(name "mbedtls-apache")
|
(name "mbedtls-apache")
|
||||||
;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
|
|
||||||
;; when updating.
|
|
||||||
(version "2.28.5")
|
(version "2.28.5")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -1016,26 +1014,6 @@ coding footprint.")
|
||||||
(hidden-package
|
(hidden-package
|
||||||
(package
|
(package
|
||||||
(inherit mbedtls-apache)
|
(inherit mbedtls-apache)
|
||||||
(name "mbedtls-apache")
|
|
||||||
(version "2.26.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/ARMmbed/mbedtls")
|
|
||||||
(commit (string-append "mbedtls-" version))))
|
|
||||||
(sha256
|
|
||||||
(base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(modules '((guix build utils)))
|
|
||||||
(snippet
|
|
||||||
'(begin
|
|
||||||
;; Can be removed with the next version.
|
|
||||||
;; Reduce level of format truncation warnings due to false positives.
|
|
||||||
;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
|
|
||||||
(substitute* "CMakeLists.txt"
|
|
||||||
(("Wformat-truncation=2") "Wformat-truncation"))
|
|
||||||
#t))))
|
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments mbedtls-apache)
|
(substitute-keyword-arguments (package-arguments mbedtls-apache)
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
|
@ -1046,9 +1024,6 @@ coding footprint.")
|
||||||
(invoke "scripts/config.pl" "set" feature))
|
(invoke "scripts/config.pl" "set" feature))
|
||||||
(list "MBEDTLS_THREADING_C"
|
(list "MBEDTLS_THREADING_C"
|
||||||
"MBEDTLS_THREADING_PTHREAD"))
|
"MBEDTLS_THREADING_PTHREAD"))
|
||||||
;; XXX The above enables code that breaks with -Werror…
|
|
||||||
(substitute* "CMakeLists.txt"
|
|
||||||
((" -Wformat-signedness") ""))
|
|
||||||
#t)))))))))
|
#t)))))))))
|
||||||
|
|
||||||
(define-public dehydrated
|
(define-public dehydrated
|
||||||
|
|
Reference in New Issue