live-bootstrap/steps-guix/guix-1.5.0/patches/fix-guile-gcrypt-configure-check.patch

28 lines
918 B
Diff

--- guix-1.5.0/m4/guix.m4
+++ guix-1.5.0/m4/guix.m4
@@ -207,8 +207,9 @@
[guix_cv_have_recent_guile_gcrypt],
[GUILE_CHECK([retval],
[(use-modules (gcrypt hash))
- (equal? (hash-algorithm sha256)
- (lookup-hash-algorithm 'sha256))])
+ (let ((algorithm (lookup-hash-algorithm 'sha256)))
+ (and algorithm
+ (= 32 (hash-size algorithm))))])
if test "$retval" = 0; then
guix_cv_have_recent_guile_gcrypt="yes"
else
--- guix-1.5.0/configure
+++ guix-1.5.0/configure
@@ -8377,8 +8377,9 @@
else
$GUILE -c "(use-modules (gcrypt hash))
- (equal? (hash-algorithm sha256)
- (lookup-hash-algorithm 'sha256))" > /dev/null 2>&1
+ (let ((algorithm (lookup-hash-algorithm 'sha256)))
+ (and algorithm
+ (= 32 (hash-size algorithm))))" > /dev/null 2>&1
retval=$?
if test "$retval" = 0; then