GNU bug report logs - #75187
[PATCH] gnu: chibi-scheme: Fix cross-compilation.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75187 in the body.
You can then email your comments to 75187 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: chibi-scheme: Fix cross-compilation.
Date: Mon, 30 Dec 2024 15:57:33 +0800

* gnu/packages/scheme.scm (chibi-scheme)[arguments]: Use G-expression.
<#:make-flags>:When cross-compilation, Set CHIBI.
[native-inputs]: When cross-compilation. Add this-package.

Change-Id: I424854d77e575f2e2aab8a5a9d32ef628c9db953
---
 gnu/packages/scheme.scm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 490a09aa1ca..678ca9db064 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2024 Skylar Hill <stellarskylark <at> posteo.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -603,14 +604,24 @@ (define-public chibi-scheme
         (base32 "02zq35hdbi03rmmamx6ml4ihsigdl4mmbf6d9ysazv8ciiln5v4b"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure))           ; no configure script
-       #:make-flags (let ((out (assoc-ref %outputs "out")))
-                      (list (string-append "PREFIX=" out)
-                            (string-append "CC=" ,(cc-for-target))
-                            (string-append "LDFLAGS=-Wl,-rpath=" out "/lib")))
-       #:test-target "test"))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))           ; no configure script
+           #:make-flags
+           #~(list
+              #$@(if
+                  (%current-target-system)
+                  #~((string-append
+                      "CHIBI=" #+(this-package-native-input "chibi-scheme")
+                      "/bin/chibi-scheme"))
+                  #~())
+              (string-append "PREFIX=" #$output)
+              (string-append "CC=" #$(cc-for-target))
+              (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+           #:test-target "test"))
+    (native-inputs (if (%current-target-system)
+                       (list this-package)
+                       (list)))
     (synopsis "Small embeddable Scheme implementation")
     (description
      "Chibi-Scheme is a very small library with no external dependencies

base-commit: a74324f31075f05e7464d23192b29967fa254f26
prerequisite-patch-id: 54256209498bcad438d9fe404caa48d0cdb1ad33
-- 
2.47.1

Message #10 received at 75187-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 75187-done <at> debbugs.gnu.org
Subject: Re: [bug#75187] [PATCH] gnu: chibi-scheme: Fix cross-compilation.
Date: Sat, 11 Jan 2025 23:31:04 +0100

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> skribis:

> * gnu/packages/scheme.scm (chibi-scheme)[arguments]: Use G-expression.
> <#:make-flags>:When cross-compilation, Set CHIBI.
> [native-inputs]: When cross-compilation. Add this-package.
>
> Change-Id: I424854d77e575f2e2aab8a5a9d32ef628c9db953

Applied, thanks!

Ludo’.

Message #13 received at 75187 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 75187 <at> debbugs.gnu.org
Subject: Re: [bug#75187] [PATCH] gnu: chibi-scheme: Fix cross-compilation.
Date: Sat, 11 Jan 2025 23:41:26 +0100

Hi,

Actually since you have commit access, I should probably have let you
push it.  Apologies!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.