From 3e480b17c73b4e0a86f1323cdaf2dcbbcf723df1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Dec 2019 23:07:13 +0100 Subject: utils: 'version-compare' delays 'dynamic-link' code. * guix/utils.scm (version-compare): Delay 'strverscmp' and force it when called. --- guix/utils.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index 728039fbf0..b3aacfa28b 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -508,14 +508,17 @@ (define (target-64bit?) (define version-compare (let ((strverscmp - (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) - (error "could not find `strverscmp' (from GNU libc)")))) - (pointer->procedure int sym (list '* '*))))) + ;; Delay symbol resolution so that this module can be used even on a + ;; statically-linked Guile. + (delay + (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) + (error "could not find `strverscmp' (from GNU libc)")))) + (pointer->procedure int sym (list '* '*)))))) (lambda (a b) "Return '> when A denotes a newer version than B, '< when A denotes a older version than B, or '= when they denote equal versions." - (let ((result (strverscmp (string->pointer a) (string->pointer b)))) + (let ((result ((force strverscmp) (string->pointer a) (string->pointer b)))) (cond ((positive? result) '>) ((negative? result) '<) (else '=)))))) -- cgit v1.2.3