all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 81cd4d2b225f20bf9894ca46867dddc78c2440db 1327 bytes (raw)
name: gnu/packages/patches/racket-backport-8.6-cross-install.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
 
From fbe2094f56fb81c888076c781e90fb0abbc0cc07 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 30 Jul 2022 07:06:55 -0600
Subject: [PATCH 1/2] CS makefiles: fix Unix-style install for cross
 compilation

Closes #4377

(cherry picked from commit 053be470e7c5454cdf48e934f3254d2d916bbbc5)
---
 racket/src/cs/c/build.zuo | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo
index 8d3950bb27..d8b74c509d 100644
--- a/racket/src/cs/c/build.zuo
+++ b/racket/src/cs/c/build.zuo
@@ -1016,10 +1016,9 @@
   (define (setup)
     (call-with-dest-racket
      (lambda (bindir dest-racket)
-       (define copytree-racket (and cross? (config-bootstrap-racket)))
+       (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket)))
        (maybe-copytree config dest-racket copytree-racket at-dir)
-       (run-raco-setup config dest-racket
-                       (and cross? (hash-ref (config-bootstrap-racket) 'racket))
+       (run-raco-setup config dest-racket copytree-racket
                        ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`,
                        ;; but redundant should be ok:
                        (list "-MCR" (~a (at-dir "compiled") ":")
-- 
2.32.0


debug log:

solving 81cd4d2b225f ...
found 81cd4d2b225f in https://yhetil.org/guix/875yipqboa.fsf@kolabnow.com/
found 2c4d8924ed5b in https://git.savannah.gnu.org/cgit/guix.git
preparing index
index prepared:
100644 2c4d8924ed5b0468a3da597e91ac988d2b1eb6be	gnu/packages/patches/racket-backport-8.6-cross-install.patch

applying [1/1] https://yhetil.org/guix/875yipqboa.fsf@kolabnow.com/
diff --git a/gnu/packages/patches/racket-backport-8.6-cross-install.patch b/gnu/packages/patches/racket-backport-8.6-cross-install.patch
index 2c4d8924ed5b..81cd4d2b225f 100644

Checking patch gnu/packages/patches/racket-backport-8.6-cross-install.patch...
Applied patch gnu/packages/patches/racket-backport-8.6-cross-install.patch cleanly.

index at:
100644 81cd4d2b225f20bf9894ca46867dddc78c2440db	gnu/packages/patches/racket-backport-8.6-cross-install.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.