me/guix
Archived
1
0
Fork 0
Code Activity

gnu: bigloo: Update to 4.0b.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2013-08-19 19:02:05 +02:00
parent ba95e7028f
commit e858326a0f
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/patches/bigloo-gc-shebangs.patch
View file

@ -1,17 +1,18 @@
Patch shebangs in source that gets unpacked by `configure'. Patch shebangs in source that gets unpacked by `configure'.
--- bigloo3.9a/gc/install-gc-7.2d 2013-01-14 15:24:01.000000000 +0100 --- bigloo4.0b/gc/install-gc-7.3alpha3-20130330 2013-08-19 10:45:20.000000000 +0200
+++ bigloo3.9a/gc/install-gc-7.2d 2013-01-14 15:23:51.000000000 +0100 +++ bigloo4.0b/gc/install-gc-7.3alpha3-20130330 2013-08-19 10:46:36.000000000 +0200
@@ -29,9 +29,11 @@ fi @@ -29,10 +29,12 @@ fi
# untar the two versions of the GC # untar the two versions of the GC
$tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1) $tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1)
/bin/rm -rf "../gc/$gc"_fth -/bin/rm -rf "../gc/$gc"_fth
+find ../gc/gc-7.2 -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P bash`|g" +rm -rf "../gc/$gc"_fth
mv ../gc/gc-7.2 "../gc/$gc"_fth || (echo "mv gc-7.2 failed"; exit 1) +find ../gc/$gc -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P sh`|g"
mv ../gc/$gc "../gc/$gc"_fth || (echo "mv $gc failed"; exit 1)
$tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1) $tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1)
+find ../gc/gc-7.2 -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P bash`|g" +find ../gc/$gc -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P sh`|g"
mv ../gc/gc-7.2 "../gc/$gc"
# general Bigloo patch # general Bigloo patch
(cd "../gc/$gc"_fth && $patch -p1 < ../$gc.patch > /dev/null)

37
gnu/packages/scheme.scm
View file

@ -118,14 +118,14 @@ development cycle.")
(define-public bigloo (define-public bigloo
(package (package
(name "bigloo") (name "bigloo")
(version "4.0a") (version "4.0b")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo" (uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1771z43nmf9awjvlvrpjfhzcfxsbw2qipir8g9r47sygf2vn59yl")))) "1fck2h48f0bvh8fl437cagmp0syfxy9lqacy1zwsis20fc76jvzi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:patches (list (assoc-ref %build-inputs "patch/shebangs")) `(#:patches (list (assoc-ref %build-inputs "patch/shebangs"))
@ -150,8 +150,14 @@ development cycle.")
"/lib/bigloo/" ,version))) "/lib/bigloo/" ,version)))
;; Those variables are used by libgc's `configure'. ;; Those variables are used by libgc's `configure'.
(setenv "SHELL" (which "bash")) (setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "bash")) (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 ;; The `configure' script doesn't understand options
;; of those of Autoconf. ;; of those of Autoconf.
@ -162,21 +168,14 @@ development cycle.")
(string-append"--mv=" (which "mv")) (string-append"--mv=" (which "mv"))
(string-append "--rm=" (which "rm")))))) (string-append "--rm=" (which "rm"))))))
(alist-cons-after (alist-cons-after
'patch 'patch-absolute-file-names 'install 'install-emacs-modes
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
(substitute* (cons "configure" (let* ((out (assoc-ref outputs "out"))
(find-files "gc" "^install-gc")) (dir (string-append out "/share/emacs/site-lisp")))
(("/bin/rm") (which "rm")) (zero? (system* "make" "-C" "bmacs" "all" "install"
(("/bin/mv") (which "mv")))) (string-append "EMACSBRAND=emacs24")
(alist-cons-after (string-append "EMACSDIR=" dir)))))
'install 'install-emacs-modes %standard-phases))))
(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 (inputs
`(("emacs" ,emacs) `(("emacs" ,emacs)
("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch")) ("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch"))