From e858326a0f8574e98336046752a4bf786a2c1d0a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 19 Aug 2013 19:02:05 +0200 Subject: gnu: bigloo: Update to 4.0b. * gnu/packages/scheme.scm (bigloo): Update to 4.0b. Patch the `configure-gc' scripts. Remove `patch-absolute-file-names' phase. * gnu/packages/patches/bigloo-gc-shebangs.patch: Adjust to new version. --- gnu/packages/scheme.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'gnu/packages/scheme.scm') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 4d717128d9..eb339d7236 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -118,14 +118,14 @@ development cycle.") (define-public bigloo (package (name "bigloo") - (version "4.0a") + (version "4.0b") (source (origin (method url-fetch) (uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo" version ".tar.gz")) (sha256 (base32 - "1771z43nmf9awjvlvrpjfhzcfxsbw2qipir8g9r47sygf2vn59yl")))) + "1fck2h48f0bvh8fl437cagmp0syfxy9lqacy1zwsis20fc76jvzi")))) (build-system gnu-build-system) (arguments `(#:patches (list (assoc-ref %build-inputs "patch/shebangs")) @@ -150,8 +150,14 @@ development cycle.") "/lib/bigloo/" ,version))) ;; Those variables are used by libgc's `configure'. - (setenv "SHELL" (which "bash")) - (setenv "CONFIG_SHELL" (which "bash")) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + + ;; ... but they turned out to be overridden later, so work + ;; around that. + (substitute* (find-files "gc" "^configure-gc") + (("sh=/bin/sh") + (string-append "sh=" (which "sh")))) ;; The `configure' script doesn't understand options ;; of those of Autoconf. @@ -162,21 +168,14 @@ development cycle.") (string-append"--mv=" (which "mv")) (string-append "--rm=" (which "rm")))))) (alist-cons-after - 'patch 'patch-absolute-file-names - (lambda _ - (substitute* (cons "configure" - (find-files "gc" "^install-gc")) - (("/bin/rm") (which "rm")) - (("/bin/mv") (which "mv")))) - (alist-cons-after - 'install 'install-emacs-modes - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/share/emacs/site-lisp"))) - (zero? (system* "make" "-C" "bmacs" "all" "install" - (string-append "EMACSBRAND=emacs24") - (string-append "EMACSDIR=" dir))))) - %standard-phases))))) + 'install 'install-emacs-modes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/emacs/site-lisp"))) + (zero? (system* "make" "-C" "bmacs" "all" "install" + (string-append "EMACSBRAND=emacs24") + (string-append "EMACSDIR=" dir))))) + %standard-phases)))) (inputs `(("emacs" ,emacs) ("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch")) -- cgit v1.2.3