ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: scm: Return #t from phases.

Browse source 
* gnu/packages/scheme.scm (scm)[arguments]: Substitute INVOKE for
SYSTEM*. Return #t rather than undefined from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-26 17:42:41 +02:00
parent 2e14ca1982
commit b44b14cd85
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/scheme.scm
View file

@ -917,39 +917,34 @@ (define-public scm
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(zero? (system* "./configure" (invoke "./configure"
(string-append "--prefix=" (string-append "--prefix="
(assoc-ref outputs "out")))))) (assoc-ref outputs "out")))))
(add-before 'build 'pre-build (add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile" (substitute* "Makefile"
(("ginstall-info") "install-info")))) (("ginstall-info") "install-info"))
#t))
(replace 'build (replace 'build
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "SCHEME_LIBRARY_PATH" (setenv "SCHEME_LIBRARY_PATH"
(string-append (assoc-ref inputs "slib") (string-append (assoc-ref inputs "slib")
"/lib/slib/")) "/lib/slib/"))
(and (invoke "make" "scmlit" "CC=gcc")
(zero? (system* "make" "scmlit" "CC=gcc")) (invoke "make" "all")))
(zero? (system* "make" "all")))))
(add-after 'install 'post-install (add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((req (let* ((out (assoc-ref outputs "out"))
(string-append (assoc-ref outputs "out") (req (string-append out "/lib/scm/require.scm")))
"/lib/scm/require.scm"))) (delete-file req)
(and (format (open req (logior O_WRONLY O_CREAT))
(delete-file req) "(define (library-vicinity) ~s)\n"
(format (open req (logior O_WRONLY O_CREAT)) (string-append (assoc-ref inputs "slib")
"(define (library-vicinity) ~s)\n" "/lib/slib/"))
(string-append (assoc-ref inputs "slib")
"/lib/slib/"))
;; We must generate the slibcat file ;; We must generate the slibcat file.
(zero? (system* (invoke (string-append out "/bin/scm")
(string-append "-br" "new-catalog")))))))
(assoc-ref outputs "out")
"/bin/scm")
"-br" "new-catalog")))))))))
(inputs `(("slib" ,slib))) (inputs `(("slib" ,slib)))
(native-inputs `(("unzip" ,unzip) (native-inputs `(("unzip" ,unzip)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))