mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

REMOVEME guix: guile-mingw: Hardcode file-name-convention.

Browse source 
Build it:

    GUIX_PACKAGE_PATH=guix guix build --target=x86_64-w64-mingw32 guile-mingw

Run it:

    WINEPATH=$(guix shell wine64 -- winepath -w                                     \
        $(echo $(guix gc -R                                                         \
                      $(GUIX_PACKAGE_PATH=guix guix build                           \
                                         --target=x86_64-w64-mingw32 guile-mingw))) \
                   | sed 's,$,/bin,g' | tr '\n' ';')                                \
            guix shell wine64 -- wine                                               \
            $(GUIX_PACKAGE_PATH=guix guix build --target=x86_64-w64-mingw32         \
                               guile-mingw)/bin/guile.exe                           \
            -c '(format #t "Hello  ~a world!\n" %host-type)'

* guix/guile-mingw-file-name-convention.patch: New file.
* guix/mingw.scm (guile-mingw): Use it.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2022-05-11 17:44:10 +02:00 • committed by Michael Gran
parent 3caa459f1f
commit be78f55238
2 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
guix/guile-mingw-file-name-convention.patch Normal file
View file

@ -0,0 +1,32 @@
From c51b9ff375834d4999978a50d6798289d923de53 Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Date: Wed, 11 May 2022 16:30:52 +0200
Subject: [PATCH] REMOVEME mingw: Hardcode compile-time-file-name-convention to
'mingw.
FIXME Apply this patch only when compiling for mingw.
Temporary hack until we have a proper fix to determine
compile-time-file-name-convention
* module/ice-9/boot-9.scm (compile-time-file-name-convention): Hardcode
to 'mingw instead of 'posix.
---
module/ice-9/boot-9.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 198a887c1..c024cc095 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2062,7 +2062,7 @@ non-locally, that exit determines the continuation."
(eval-when (eval)
(define (compile-time-file-name-convention)
- (let ((target (or "FIXME" ((@ (system base target) target-type)))))
+ (let ((target (or "mingw" "FIXME" ((@ (system base target) target-type)))))
(cond ((equal? target %host-type)
(system-file-name-convention))
((string-contains-ci target "mingw")
--
2.35.1

3
guix/mingw.scm
View file

@ -84,6 +84,9 @@
(define-public guile-3.0-mingw
(package
(inherit guile-3.0-patched)
(source (origin (inherit (package-source guile-3.0-patched))
(patches
(search-patches "guile-mingw-file-name-convention.patch"))))
(name "guile-mingw")
(native-inputs
`(("self" ,guile-3.0-patched)