From: Gwen Weinholt Date: Sun, 26 May 2024 12:29:50 +0200 Subject: Do not use catalog:expand-path Support older slib by reverting the following patch from upstream: | Author: jaffer | Date: Sun Oct 15 02:17:39 2023 +0000 | | Summary: 2023-10-14 Aubrey Jaffer | | Patch from Radey Shouman to use SLIB's new catalog:expand-path. --- mkimpcat.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mkimpcat.scm b/mkimpcat.scm index ca65f06..c06e157 100755 --- a/mkimpcat.scm +++ b/mkimpcat.scm @@ -19,9 +19,8 @@ (let ((catname "implcat") (iv (implementation-vicinity))) - ;;(define (in-implementation-vicinity . paths) (apply in-vicinity iv paths)) - (define (in-implementation-vicinity . paths) (cons 'implementation paths)) - (call-with-output-file (in-vicinity iv catname) + (define (in-implementation-vicinity . paths) (apply in-vicinity iv paths)) + (call-with-output-file (in-implementation-vicinity catname) (lambda (op) (define (display* . args) (for-each (lambda (arg) (display arg op)) args) @@ -38,7 +37,7 @@ (rem (cdr l))) ((car l) (cons (car l) (rem (cdr l)))) (else (rem (cdr l)))))) - (cond ((file-exists? (catalog:expand-path (car libs))) + (cond ((file-exists? (car libs)) (display " " op) (write (cons feature (cons 'compiled (append syms libs))) @@ -51,8 +50,7 @@ (write (cons from to) op) (newline op)) (define (add-source feature filename) - (cond ((file-exists? (string-append (catalog:expand-path filename) - (scheme-file-suffix))) + (cond ((file-exists? (string-append filename (scheme-file-suffix))) (display " " op) (write (list feature 'source filename) op) (newline op)