gnu: bigloo: Update to 4.3b.

* gnu/packages/scheme.scm (bigloo): Update to 4.3b.
[arguments]: Add "--disable-patch" to configure flags.  Add substitution to
compile Bigloo with the correct runpath. Substitute 'invoke' for '*system*'.
This commit is contained in:
Kei Kebreau 2018-02-05 16:31:42 -05:00
parent a630c64709
commit 26ecbaf866
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 25 additions and 22 deletions

View File

@ -200,14 +200,14 @@ features an integrated Emacs-like editor and a large runtime library.")
(define-public bigloo (define-public bigloo
(package (package
(name "bigloo") (name "bigloo")
(version "4.3a") (version "4.3b")
(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
"03rcqs6kvy2j5lqk4fidqay5qfyp474qqspbh6wk4qdbds6w599w")) "1xpzxjlq5g8j3jrb908kfaaa0pkynk4rd083hzvb08amhy68sx07"))
;; Remove bundled libraries. ;; Remove bundled libraries.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -229,34 +229,37 @@ features an integrated Emacs-like editor and a large runtime library.")
((", @DATE@") "")) ((", @DATE@") ""))
(substitute* "autoconf/osversion" (substitute* "autoconf/osversion"
(("^version.*$") "version=\"\"\n")) (("^version.*$") "version=\"\"\n"))
(substitute* "comptime/Makefile"
(("\\$\\(LDCOMPLIBS\\)")
"$(LDCOMPLIBS) $(LDFLAGS)"))
;; The `configure' script doesn't understand options ;; The `configure' script doesn't understand options
;; of those of Autoconf. ;; of those of Autoconf.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(zero? (invoke "./configure"
(system* "./configure" (string-append "--prefix=" out)
(string-append "--prefix=" out) ; use system libraries
; use system libraries "--customgc=no"
"--customgc=no" "--customunistring=no"
"--customunistring=no" "--customlibuv=no"
"--customlibuv=no" (string-append"--mv=" (which "mv"))
(string-append"--mv=" (which "mv")) (string-append "--rm=" (which "rm"))
(string-append "--rm=" (which "rm")) "--cflags=-fPIC"
"--cflags=-fPIC" (string-append "--ldflags=-Wl,-rpath="
(string-append "--ldflags=-Wl,-rpath=" (assoc-ref outputs "out")
(assoc-ref outputs "out") "/lib/bigloo/" ,version)
"/lib/bigloo/" ,version) (string-append "--lispdir=" out
(string-append "--lispdir=" out "/share/emacs/site-lisp")
"/share/emacs/site-lisp") "--sharedbde=yes"
"--sharedbde=yes" "--sharedcompiler=yes"
"--sharedcompiler=yes"))))) "--disable-patch"))))
(add-after 'install 'install-emacs-modes (add-after 'install 'install-emacs-modes
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/share/emacs/site-lisp"))) (dir (string-append out "/share/emacs/site-lisp")))
(zero? (system* "make" "-C" "bmacs" "all" "install" (invoke "make" "-C" "bmacs" "all" "install"
(string-append "EMACSBRAND=emacs25") (string-append "EMACSBRAND=emacs25")
(string-append "EMACSDIR=" dir))))))))) (string-append "EMACSDIR=" dir))))))))
(inputs (inputs
`(("emacs" ,emacs) ;UDE needs the X version of Emacs `(("emacs" ,emacs) ;UDE needs the X version of Emacs
("libgc" ,libgc) ("libgc" ,libgc)