diff mbox series

[bug#73235] gnu: gauche: Fix build, enable TLS, and use gexps.

Message ID 87ikuz2ty9.fsf@antr.me
State New
Headers show
Series [bug#73235] gnu: gauche: Fix build, enable TLS, and use gexps. | expand

Commit Message

Antero Mejr Sept. 13, 2024, 8:13 p.m. UTC 
There is a known test issue that will be fixed next release:
https://github.com/shirok/Gauche/issues/1044

* gnu/packages/scheme.scm (gauche): Fix build failure and enable TLS.
[arguments]: Set #:tests? to #f until next release, and add --with-tls
configure flag.
[inputs]: Add mbedtls.

Change-Id: Iceacb882e74f5a8e3e11d663cca51baafbcbeb69
---
Resolves https://issues.guix.gnu.org/73113

 gnu/packages/scheme.scm | 58 +++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 28 deletions(-)


base-commit: f1bdb291dc5d65de2c88e339df5e515fb4b3544c
diff mbox series

Patch

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 647f7e71d2..6f9d00e440 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -1098,38 +1098,40 @@  (define-public gauche
         (base32 "10zpbbikkcpdzk6c52wkckiyhn7nhnqjv2djdzyjr0n8qxxy4hrn"))))
     (build-system gnu-build-system)
     (inputs
-     (list libatomic-ops slib zlib))
+     (list libatomic-ops mbedtls slib zlib))
     (native-inputs
      (list texinfo openssl ; needed for tests
            pkg-config))    ; needed to find external libatomic-ops
     (arguments
-     `(#:configure-flags
-       (list (string-append "--with-slib="
-                            (assoc-ref %build-inputs "slib")
-                            "/lib/slib"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-/bin/sh
-           ;; Needed only for tests.
-           (lambda _
-             (substitute* '("test/www.scm"
-                            "ext/tls/test.scm"
-                            "lib/gauche/package/util.scm"
-                            "libsrc/gauche/process.scm")
-               (("/bin/sh") (which "sh")))))
-         (add-after 'build 'build-doc
-           (lambda _
-             (with-directory-excursion "doc"
-               (invoke "make" "info"))))
-         (add-before 'check 'patch-network-tests
-           ;; Remove net checks.
-           (lambda _
-             (delete-file "test/net.scm")
-             (invoke "touch" "test/net.scm")))
-         (add-after 'install 'install-docs
-           (lambda _
-             (with-directory-excursion "doc"
-               (invoke "make" "install")))))))
+     (list #:tests? #f ; 9 ffitest failures, known issue (fixed in 0.9.16):
+           ;; https://github.com/shirok/Gauche/issues/1044
+           #:configure-flags
+           #~(list (string-append "--with-slib=" #$(this-package-input "slib")
+                                  "/lib/slib")
+                   "--with-tls=mbedtls")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-/bin/sh
+                 ;; Needed only for tests.
+                 (lambda _
+                   (substitute* '("test/www.scm"
+                                  "ext/tls/test.scm"
+                                  "lib/gauche/package/util.scm"
+                                  "libsrc/gauche/process.scm")
+                     (("/bin/sh") (which "sh")))))
+               (add-after 'build 'build-doc
+                 (lambda _
+                   (with-directory-excursion "doc"
+                     (invoke "make" "info"))))
+               (add-before 'check 'patch-network-tests
+                 ;; Remove net checks.
+                 (lambda _
+                   (delete-file "test/net.scm")
+                   (invoke "touch" "test/net.scm")))
+               (add-after 'install 'install-docs
+                 (lambda _
+                   (with-directory-excursion "doc"
+                     (invoke "make" "install")))))))
     (synopsis "Scheme scripting engine")
     (description "Gauche is a R7RS Scheme scripting engine aiming at being a
 handy tool that helps programmers and system administrators to write small to