From 39df72eeaa24619833641257bbdbd48a263420e1 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sun, 24 Aug 2025 10:28:36 +0300
Subject: [PATCH] Racket fixes

---
 Dockerfile    |  3 +--
 libs/data.sld | 14 ++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8d22713..807934c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,7 @@ WORKDIR /builddir
 COPY Makefile .
 COPY compile-r7rs.scm .
 COPY libs/ libs/
-#RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-RUN git clone https://github.com/Retropikzel/chibi-scheme.git --depth=1 --branch=snow-chibi-chicken-static
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
 RUN cd chibi-scheme && make -j 32 && make -j 32 install
 RUN make PREFIX=/opt/compile-r7rs build-chicken-static && make PREFIX=/opt/compile-r7rs install
 
diff --git a/libs/data.sld b/libs/data.sld
index 239c0e8..1e6954a 100644
--- a/libs/data.sld
+++ b/libs/data.sld
@@ -423,7 +423,9 @@
                                   (apply string-append
                                          `("printf"
                                            " "
-                                           "'#lang r7rs\\n(import (only (scheme base) include))\\n(include \""
+                                           "'#lang r7rs\\n"
+                                           "(import (except (scheme base) let string-copy string-copy! string-for-each string-map string-fill! string->list))\\n"
+                                           "(include \""
                                            ,(path->filename library-file)
                                            "\")\\n"
                                            "'"
@@ -444,21 +446,17 @@
                               (lambda ()
                                 (display "#lang r7rs")
                                 (newline)
-                                (display "(import (scheme base))")
+                                (display "(import (except (scheme base) let string-copy string-copy! string-for-each string-map string-fill! string->list))")
                                 (newline)
                                 (display "(include \"")
                                 (display (path->filename input-file))
                                 (display "\")")
                                 (newline)))))
                         (apply string-append
-                               `("racket"
-                                 " "
+                               `("racket "
                                  ,(util-getenv "COMPILE_R7RS_RACKET")
                                  " "
-                                 "-I"
-                                 " "
-                                 ,(if r6rs? "r6rs" "r7rs")
-                                 " "
+                                 ;"-I " ,(if r6rs? "r6rs " "r7rs ")
                                  ,@(map (lambda (item)
                                           (string-append "-S " item " "))
                                         (append prepend-directories