* [bug#69443] [PATCH] gnu: Add guile-gsl.
@ 2024-02-27 22:56 Artyom Bologov
2024-03-08 23:29 ` [bug#69443] [PATCH] gnu: guile-gsl: Fix build Artyom V. Poptsov
2024-04-04 11:27 ` bug#69443: [PATCH] gnu: Add guile-gsl Sharlatan Hellseher
0 siblings, 2 replies; 3+ messages in thread
From: Artyom Bologov @ 2024-02-27 22:56 UTC (permalink / raw)
To: 69443
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
Hi y'all,
This is both a patch submission and a call for help—I'm far out of my
waters with this package and am not sure of the proper Guix-y way to
build it.
So the build sequence for Guile GSL is:
(1) Compile a bundled libguilegslblas.so with a C compiler, using the GSL
libraries from package inputs.
(2) Put proper paths to the GSL libraries and libguilegslblas into the
Scheme files.
(3) Compile Scheme files as per guile-build-system.
I've got (2) and (3) more or less working. The problem is: which build
system should I use and how do I synthesize GNU build system (makefile,
libguilegslblas.so, (1)) and Guile one?
You can find my draft (doesn't build and is not usable in general) patch
attached below. Any help appreciated!
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnu: Add guile-gsl --]
[-- Type: text/x-patch, Size: 2213 bytes --]
From 5bd38a674fff008c189d1c39495d771354c945fb Mon Sep 17 00:00:00 2001
From: Artyom Bologov <mail@aartaka.me>
Date: Wed, 28 Feb 2024 02:54:31 +0400
Subject: [PATCH] gnu: Add guile-gsl.
* gnu/packages/guile-xyz.scm (guile-gsl): New variable.
---
gnu/packages/guile-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b34472d5bd..6b9492c4b7 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -4474,6 +4474,40 @@ (define-public guile-ffi-cblas
function: raw, typed, and functional.")
(license license:lgpl3+))))
+(define-public guile-gsl
+ (let ((commit "8540bcb6afa9be37153852255608d26d5a4df9dd")
+ (revision "0"))
+ (package
+ (name "guile-gsl")
+ (version "0.0.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aartaka/guile-gsl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00dy33ibvfhzs5xp65g4g8d02wy4fiamjbp3pg87cghg41q4lwkr"))))
+ (build-system guile-build-system)
+ (arguments
+ '(#:source-directory "modules"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'substitute-gsl-so
+ (lambda _
+ (let ((gsl (string-append #$(this-package-input "lmdb")
+ "/lib/libgsl.so")))
+ (substitute* "modules/gsl/core.scm"
+ (("libgsl.so") gsl))))))))
+ (native-inputs (list guile-3.0))
+ (inputs (list guile-3.0 gsl))
+ (home-page "https://github.com/aartaka/guile-gsl")
+ (synopsis "Bindings for GNU Scientific library in Guile.")
+ (description "This package provides Guile Scheme wrapper for libgsl.so.
+Only vector, matrix, and BLAS operations are covered for now.")
+ (license license:gpl3+))))
+
(define-public guile-ffi-fftw
(let ((commit "294ad9e7491dcb40026d2fec9be2af05263be1c0")
(revision "2"))
--
2.41.0
[-- Attachment #3: Type: text/plain, Size: 28 bytes --]
Thanks,
--
Artyom Bologov.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#69443] [PATCH] gnu: guile-gsl: Fix build.
2024-02-27 22:56 [bug#69443] [PATCH] gnu: Add guile-gsl Artyom Bologov
@ 2024-03-08 23:29 ` Artyom V. Poptsov
2024-04-04 11:27 ` bug#69443: [PATCH] gnu: Add guile-gsl Sharlatan Hellseher
1 sibling, 0 replies; 3+ messages in thread
From: Artyom V. Poptsov @ 2024-03-08 23:29 UTC (permalink / raw)
To: 69443
Cc: Artyom V. Poptsov, mail, glv, cox.katherine.e+guix, me,
sharlatanus, jgart
* gnu/packages/guile-xyz.scm (guile-gsl): Fix build.
Change-Id: Iaf653f25fd2b972e575d9c2fd1607cd490cc17db
---
gnu/packages/guile-xyz.scm | 86 ++++++++++++++++++++++++++++----------
1 file changed, 65 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9ddcc626fe..1f9d1ecb3e 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -4522,31 +4522,75 @@ (define-public guile-gsl
(package
(name "guile-gsl")
(version "0.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aartaka/guile-gsl")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "00dy33ibvfhzs5xp65g4g8d02wy4fiamjbp3pg87cghg41q4lwkr"))))
- (build-system guile-build-system)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aartaka/guile-gsl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00dy33ibvfhzs5xp65g4g8d02wy4fiamjbp3pg87cghg41q4lwkr"))))
+ (build-system gnu-build-system)
(arguments
- '(#:source-directory "modules"
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'build 'substitute-gsl-so
- (lambda _
- (let ((gsl (string-append #$(this-package-input "lmdb")
- "/lib/libgsl.so")))
- (substitute* "modules/gsl/core.scm"
- (("libgsl.so") gsl))))))))
+ (list
+ #:modules `(((guix build guile-build-system)
+ #:select (target-guile-effective-version))
+ ,@%gnu-build-system-modules)
+ #:imported-modules `((guix build guile-build-system)
+ ,@%gnu-build-system-modules)
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'build 'substitute-gsl-so
+ (lambda _
+ (let ((gsl (string-append #$(this-package-input "gsl")
+ "/lib/libgsl.so")))
+ (substitute* "modules/gsl/core.scm"
+ (("libgsl.so")
+ gsl)))))
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "CC" "gcc")
+ (setenv "GUILE_AUTO_COMPILE" "0")
+ (invoke "make")
+ (setenv "LD_LIBRARY_PATH" "./")
+ (let* ((module-dir "modules")
+ (prefix (string-length module-dir)))
+ (for-each (lambda (file)
+ (let* ((base (string-drop (string-drop-right
+ file 4)
+ prefix))
+ (go (string-append "go" base
+ ".go")))
+ (invoke "guild"
+ "compile"
+ "-L"
+ module-dir
+ file
+ "-o"
+ go)))
+ (find-files module-dir "\\.scm$")))))
+ (delete 'check) ;no tests
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((lib (string-append #$output "/lib"))
+ (guile #$(this-package-input "guile"))
+ (version (target-guile-effective-version guile))
+ (scm (string-append "/share/guile/site/"
+ version))
+ (go (string-append "/lib/guile/" version
+ "/site-ccache")))
+ (install-file "libguilegslblas.so" lib)
+ (copy-recursively "modules/"
+ (string-append #$output scm))
+ (copy-recursively "go/"
+ (string-append #$output go))))))))
(native-inputs (list guile-3.0))
(inputs (list guile-3.0 gsl))
(home-page "https://github.com/aartaka/guile-gsl")
- (synopsis "Bindings for GNU Scientific library in Guile.")
- (description "This package provides Guile Scheme wrapper for libgsl.so.
+ (synopsis "Bindings for GNU Scientific library in Guile")
+ (description
+ "This package provides Guile Scheme wrapper for @code{libgsl.so}.
Only vector, matrix, and BLAS operations are covered for now.")
(license license:gpl3+))))
base-commit: 38a00bc089205818a351c363a107b8ba5c99fd0d
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#69443: [PATCH] gnu: Add guile-gsl.
2024-02-27 22:56 [bug#69443] [PATCH] gnu: Add guile-gsl Artyom Bologov
2024-03-08 23:29 ` [bug#69443] [PATCH] gnu: guile-gsl: Fix build Artyom V. Poptsov
@ 2024-04-04 11:27 ` Sharlatan Hellseher
1 sibling, 0 replies; 3+ messages in thread
From: Sharlatan Hellseher @ 2024-04-04 11:27 UTC (permalink / raw)
To: 69443-done
[-- Attachment #1: Type: text/plain, Size: 80 bytes --]
Hi,
Patch applied based on <https://issues.guix.gnu.org/69820>.
Thanks,
Oleg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-04 11:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-27 22:56 [bug#69443] [PATCH] gnu: Add guile-gsl Artyom Bologov
2024-03-08 23:29 ` [bug#69443] [PATCH] gnu: guile-gsl: Fix build Artyom V. Poptsov
2024-04-04 11:27 ` bug#69443: [PATCH] gnu: Add guile-gsl Sharlatan Hellseher
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).