From eb0c1e74628d203809bc9f6b6a728f2999d535cf Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Wed, 23 Dec 2020 03:35:34 -0600 Subject: gnu: gauche: Update to 0.9.10. * gnu/packages/scheme.scm (gauche): Update to 0.9.10. [arguments]: Adjust file list in custom 'patch-/bin/sh phase. Remove 'patch-normalize-test phase. Adjust 'patch-network-tests phase. Signed-off-by: Efraim Flashner --- gnu/packages/scheme.scm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'gnu/packages/scheme.scm') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index b647b9ee2e..3f95ed1ca7 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1010,7 +1010,7 @@ The core is 12 builtin special forms and 33 builtin functions.") (define-public gauche (package (name "gauche") - (version "0.9.9") + (version "0.9.10") (home-page "https://practical-scheme.net/gauche/index.html") (source (origin @@ -1019,7 +1019,7 @@ The core is 12 builtin special forms and 33 builtin functions.") "mirror://sourceforge/gauche/Gauche/Gauche-" version ".tgz")) (sha256 - (base32 "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac")) + (base32 "0ci57ak5cp3lkmfy3nh50hifh8nbg58hh6r18asq0rn5mqfxyf8g")) (modules '((guix build utils))) (snippet '(begin ;; Remove libatomic-ops. @@ -1039,13 +1039,10 @@ The core is 12 builtin special forms and 33 builtin functions.") (add-after 'unpack 'patch-/bin/sh ;; Needed only for tests. (lambda _ - (substitute* '("configure" - "test/www.scm" + (substitute* '("test/www.scm" "ext/tls/test.scm" - "gc/configure" - "lib/gauche/configure.scm" "lib/gauche/package/util.scm" - "lib/gauche/process.scm") + "libsrc/gauche/process.scm") (("/bin/sh") (which "sh"))) #t)) (add-after 'build 'build-doc @@ -1053,18 +1050,11 @@ The core is 12 builtin special forms and 33 builtin functions.") (with-directory-excursion "doc" (invoke "make" "info")) #t)) - (add-before 'check 'patch-normalize-test - ;; Neutralize sys-normalize-pathname test as it relies on - ;; the home directory; (setenv "HOME" xx) isn't enough). - (lambda _ - (substitute* "test/system.scm" - (("~/abc") "//abc")) - #t)) (add-before 'check 'patch-network-tests ;; Remove net checks. (lambda _ - (substitute* "ext/Makefile" - (("binary net termios") "binary termios")) + (delete-file "ext/net/test.scm") + (invoke "touch" "ext/net/test.scm") #t)) (add-after 'install 'install-docs (lambda _ -- cgit v1.2.3 From 7f3516274032ed497e0ab049c95600e88c6cc674 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 26 Dec 2020 22:12:29 +0200 Subject: gnu: gauche: Add slib support. * gnu/packages/scheme.scm (gauche)[inputs]: Add slib. [arguments]: Add configure-flag to find slib. --- gnu/packages/scheme.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/scheme.scm') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 3f95ed1ca7..6c30ed8bf6 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Federico Beffa ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2020 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017 John Darrington @@ -1028,13 +1028,18 @@ The core is 12 builtin special forms and 33 builtin functions.") (build-system gnu-build-system) (inputs `(("libatomic-ops" ,libatomic-ops) + ("slib" ,slib) ("zlib" ,zlib))) (native-inputs `(("texinfo" ,texinfo) ("openssl" ,openssl) ; needed for tests ("pkg-config" ,pkg-config))) ; needed to find external libatomic-ops (arguments - `(#:phases + `(#: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. -- cgit v1.2.3