ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mbedtls-apache-for-hiawatha: Fix.

Browse source 
There's already a custom embedtls-apache variant for Hiawatha.
Fix it instead of enabling threading for embedtls-apache.

* gnu/packages/tls.scm (embedtls-for-hiawatha): Fix usage of
SUBSTITUTE-KEYWORD-ARGUMENTS.  Disable -Wformat-signedness.
(embedtls-for-hiawatha): Remove ‘enable-features’ phase.
This commit is contained in:
Tobias Geerinckx-Rice 2020-07-14 03:50:47 +02:00
parent 9cb208d86b
commit 5cdb25c686
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/tls.scm
View file

@ -891,7 +891,8 @@ (define-public acme-client
(define-public mbedtls-apache
(package
(name "mbedtls-apache")
;; XXX Check whether ‘-Wformat-signedness’ below still breaks when updating.
;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
;; when updating.
(version "2.23.0")
(source
(origin
@ -912,17 +913,6 @@ (define-public mbedtls-apache
(add-after 'unpack 'make-source-writable
(lambda _
(for-each make-file-writable (find-files "."))
#t))
(add-before 'configure 'enable-features
;; Some packages like Hiawatha depend on ’less embedded’ features.
(lambda _
(substitute* "include/mbedtls/config.h"
(("//(#define MBEDTLS_THREADING_(C|PTHREAD))"
_ match)
match))
;; XXX The above enables code that breaks with -Werror…
(substitute* "CMakeLists.txt"
((" -Wformat-signedness") ""))
#t)))))
(native-inputs
`(("perl" ,perl)
@ -942,17 +932,19 @@ (define-public mbedtls-for-hiawatha
(package
(inherit mbedtls-apache)
(arguments
(substitute-keyword-arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'configure 'configure-extra-features
(lambda _
(for-each (lambda (feature)
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
#t)))
,@(package-arguments mbedtls-apache)))))))
(substitute-keyword-arguments (package-arguments mbedtls-apache)
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'configure-extra-features
(lambda _
(for-each (lambda (feature)
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
;; XXX The above enables code that breaks with -Werror…
(substitute* "CMakeLists.txt"
((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
(package