[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#53878] [PATCH v7 15/24] gnu: chez-scheme: Use "lib/chez-scheme" for
From: |
Philip McGrath |
Subject: |
[bug#53878] [PATCH v7 15/24] gnu: chez-scheme: Use "lib/chez-scheme" for search path. |
Date: |
Sun, 27 Feb 2022 16:29:11 -0500 |
There does not seem to be any widely accepted standard path to use for
"CHEZSCHEMELIBDIRS". Using a path without a version number in it avoids
having to compute the actual path everywhere, which would be especially
unpleasant when support is added for the Racket variant of Chez Scheme,
which always has a different version number than upstream.
* gnu/packages/chez.scm (chez-scheme)[native-search-paths]: Change to
use "lib/chez-scheme" instead of "lib/csvX.Y.Z-site" for
"CHEZSCHEMELIBDIRS".
(chez-make-flags): Update accordingly.
(chez-sockets)[arguments]<#:phases>: Likewise.
---
gnu/packages/chez.scm | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 4ee9711bb4..f4c87fbcf7 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -233,7 +233,7 @@ (define-public chez-scheme
(native-search-paths
(list (search-path-specification
(variable "CHEZSCHEMELIBDIRS")
- (files (list (string-append "lib/csv" version "-site"))))))
+ (files '("lib/chez-scheme")))))
(outputs '("out" "doc"))
(arguments
`(#:modules
@@ -458,9 +458,9 @@ (define chez-configure
(define (chez-make-flags name version)
#~(let ((out #$output))
(list
- ;; Set 'chezversion' so that libraries are installed in
- ;; 'lib/csvX.Y.Z-site' like Chez's 'native-search-paths' expects.
- (string-append "chezversion=" #$(package-version chez-scheme))
+ ;; Set 'schemedir' so that libraries are installed in
+ ;; 'lib/chez-scheme' like Chez's 'native-search-paths' expects.
+ (string-append "schemedir=" out "/lib/chez-scheme")
(string-append "PREFIX=" out)
(string-append "DOCDIR=" out "/share/doc/" #$name "-" #$version))))
@@ -608,9 +608,7 @@ (define-public chez-sockets
(replace 'build
(lambda args
(let ((chez-site (string-append #$output
- "/lib/csv"
- (package-version chez-scheme)
- "-site/arcfide")))
+ "/lib/chez-scheme/arcfide")))
;; make sure Chez Scheme can find the shared libraries.
(substitute* "sockets.ss"
(("(object \")(socket-ffi-values\\.[sd][oy][^\"]*)(\")"
@@ -634,9 +632,7 @@ (define-public chez-sockets
(lambda args
(install-file "sockets.so"
(string-append #$output
- "/lib/csv"
- #$(package-version chez-scheme)
- "-site/arcfide"))
+ "/lib/chez-scheme/arcfide"))
(install-file "sockets.pdf"
(string-append #$output
"/share/doc/"
--
2.32.0
- [bug#53878] [PATCH v7 06/24] gnu: racket-minimal: Change inheritance to follow bootstrapping., (continued)
- [bug#53878] [PATCH v7 06/24] gnu: racket-minimal: Change inheritance to follow bootstrapping., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 04/24] gnu: racket-minimal: Use new package style., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 07/24] gnu: racket-minimal: Adjust indentation., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 09/24] gnu: configure-layer.rkt: Adjust indentation., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 11/24] gnu: racket: Move Chez bootfiles to (gnu packages chez)., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 12/24] gnu: chez: Add utilities for Chez machine types., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 08/24] gnu: racket-minimal: Add "debug" output., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 10/24] gnu: racket-minimal: Separate from the Racket VM., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 13/24] gnu: racket: Add 'racket-vm-for-system'., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 14/24] gnu: chez-scheme: Use new style for Chez packages., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 15/24] gnu: chez-scheme: Use "lib/chez-scheme" for search path.,
Philip McGrath <=
- [bug#53878] [PATCH v7 17/24] gnu: chez-scheme: Use new package style., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 16/24] gnu: chez-scheme: Use shared zlib and lz4., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 18/24] gnu: Add stex., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 19/24] gnu: Add chez-nanopass., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 20/24] gnu: chez-scheme: Explicitly package bootstrap bootfiles., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 21/24] gnu: chez-mit: Support chez-scheme-for-racket., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 22/24] gnu: Add chez-scheme-for-racket., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 23/24] gnu: chez: Add 'chez-scheme-for-system'., Philip McGrath, 2022/02/27
- [bug#53878] [PATCH v7 24/24] gnu: racket-vm-cs: Build with "--enable-scheme"., Philip McGrath, 2022/02/27