[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: gnu: guile-pfds: When using Guile 3, compile as a r6rs library.
From: |
guix-commits |
Subject: |
07/07: gnu: guile-pfds: When using Guile 3, compile as a r6rs library. |
Date: |
Mon, 7 Sep 2020 02:49:35 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit 45231d17580bd1f6bc9c5d7b84e79c7f4cdc7b93
Author: Martin Becze <mjbecze@riseup.net>
AuthorDate: Fri Sep 4 15:25:14 2020 -0500
gnu: guile-pfds: When using Guile 3, compile as a r6rs library.
This allow the package to be resused by r6rs compliant scheme
implementations
that expect *.sls files.
* gnu/packages/guile-xyz.scm (guile2.2-pfds): Rename *.sls files to *.scm
since Guile 2 does not support the sls extension.
(guile-pfds): Removed the renaming of files to *.sls to *.scm.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/guile-xyz.scm | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index de2aed1..f88ebf2 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -798,6 +798,7 @@ using Guile's foreign function interface.")
(build-system guile-build-system)
(arguments
'(#:source-directory "src"
+ #:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch")
#:phases (modify-phases %standard-phases
(add-after 'unpack 'move-files-around
(lambda _
@@ -806,8 +807,7 @@ using Guile's foreign function interface.")
(mkdir-p "src/pfds")
(for-each (lambda (file)
(rename-file file
- (string-append "src/pfds/"
- file)))
+ (string-append "src/pfds/" file)))
'("bbtrees.sls"
"deques"
"deques.sls"
@@ -821,15 +821,6 @@ using Guile's foreign function interface.")
"queues.sls"
"sequences.sls"
"sets.sls"))
-
- ;; In Guile <= 2.2.4, there's no way to tell 'guild
- ;; compile' to accept the ".sls" extension. So...
- (for-each (lambda (file)
- (rename-file file
- (string-append
- (string-drop-right file 4)
- ".scm")))
- (find-files "." "\\.sls$"))
#t)))))
(native-inputs
`(("guile" ,guile-3.0)))
@@ -892,7 +883,18 @@ types are supported.")
(substitute-keyword-arguments (package-arguments guile-pfds)
((#:phases phases)
`(modify-phases ,phases
- (delete 'work-around-guile-bug)))))))
+ (delete 'work-around-guile-bug)
+ (add-after 'move-files-around 'sls->scm
+ (lambda _
+ ;; In Guile <= 2.2.4, there's no way to tell 'guild
+ ;; compile' to accept the ".sls" extension. So...
+ (for-each (lambda (file)
+ (rename-file file
+ (string-append
+ (string-drop-right file 4)
+ ".scm")))
+ (find-files "." "\\.sls$"))
+ #t))))))))
(define-public guile3.0-pfds
(deprecated-package "guile3.0-pfds" guile-pfds))
- branch master updated (098593e -> 45231d1), guix-commits, 2020/09/07
- 01/07: gnu: libhandy: Update to 0.91.0., guix-commits, 2020/09/07
- 03/07: gnu: libsass: Update to 3.6.4., guix-commits, 2020/09/07
- 02/07: gnu: xournalpp: Fix path to addr2line binary., guix-commits, 2020/09/07
- 04/07: gnu: coq-equations: Update 1.2.1-8.10-2., guix-commits, 2020/09/07
- 05/07: gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f., guix-commits, 2020/09/07
- 07/07: gnu: guile-pfds: When using Guile 3, compile as a r6rs library.,
guix-commits <=
- 06/07: gnu: g-golf: Update to 0.1.0-822.84e894e., guix-commits, 2020/09/07