kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix): minimize guile-gcrypt configure probe

Browse source
This commit is contained in:
vxtls 2026-03-06 08:57:13 -05:00
parent 29695ad074
commit ba7aec9868
1 changed files with 7 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
steps-guix/guix-1.5.0/patches/fix-guile-gcrypt-configure-check.patch
View file

@ -1,48 +1,28 @@
--- guix-1.5.0/m4/guix.m4 --- guix-1.5.0/m4/guix.m4
+++ guix-1.5.0/m4/guix.m4 +++ guix-1.5.0/m4/guix.m4
@@ -206,9 +206,18 @@ @@ -207,8 +207,9 @@
AC_CACHE_CHECK([whether Guile-Gcrypt is available and recent enough],
[guix_cv_have_recent_guile_gcrypt], [guix_cv_have_recent_guile_gcrypt],
[GUILE_CHECK([retval], [GUILE_CHECK([retval],
- [(use-modules (gcrypt hash)) [(use-modules (gcrypt hash))
- (equal? (hash-algorithm sha256) - (equal? (hash-algorithm sha256)
- (lookup-hash-algorithm 'sha256))]) - (lookup-hash-algorithm 'sha256))])
+ [(use-modules (gcrypt hash)
+ (rnrs bytevectors))
+ (let ((algorithm (lookup-hash-algorithm 'sha256))) + (let ((algorithm (lookup-hash-algorithm 'sha256)))
+ (and algorithm + (and algorithm
+ (eq? 'sha256 (hash-algorithm-name algorithm)) + (= 32 (hash-size algorithm))))])
+ (= 32 (hash-size algorithm))
+ (bytevector=?
+ (sha256 #vu8(97 98 99))
+ #vu8(186 120 22 191 143 1 207 234
+ 65 65 64 222 93 174 34 35
+ 176 3 97 163 150 23 122 156
+ 180 16 255 97 242 0 21 173)))))])
if test "$retval" = 0; then if test "$retval" = 0; then
guix_cv_have_recent_guile_gcrypt="yes" guix_cv_have_recent_guile_gcrypt="yes"
else else
--- guix-1.5.0/configure --- guix-1.5.0/configure
+++ guix-1.5.0/configure +++ guix-1.5.0/configure
@@ -8376,9 +8376,18 @@ @@ -8377,8 +8377,9 @@
$as_echo_n "(cached) " >&6
else else
- $GUILE -c "(use-modules (gcrypt hash)) $GUILE -c "(use-modules (gcrypt hash))
- (equal? (hash-algorithm sha256) - (equal? (hash-algorithm sha256)
- (lookup-hash-algorithm 'sha256))" > /dev/null 2>&1 - (lookup-hash-algorithm 'sha256))" > /dev/null 2>&1
+ $GUILE -c "(use-modules (gcrypt hash)
+ (rnrs bytevectors))
+ (let ((algorithm (lookup-hash-algorithm 'sha256))) + (let ((algorithm (lookup-hash-algorithm 'sha256)))
+ (and algorithm + (and algorithm
+ (eq? 'sha256 (hash-algorithm-name algorithm)) + (= 32 (hash-size algorithm))))" > /dev/null 2>&1
+ (= 32 (hash-size algorithm))
+ (bytevector=?
+ (sha256 #vu8(97 98 99))
+ #vu8(186 120 22 191 143 1 207 234
+ 65 65 64 222 93 174 34 35
+ 176 3 97 163 150 23 122 156
+ 180 16 255 97 242 0 21 173)))))" > /dev/null 2>&1
retval=$? retval=$?
if test "$retval" = 0; then if test "$retval" = 0; then