mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-07-02 23:54:07 +02:00
gnu: octave-cli: Improve style.
* gnu/packages/maths.scm (octave-cli)[arguments]: Run guix style.
<#:phases>{configure-makeinfo}: Rewrite to use search-input-file.
Change-Id: Iadfdab2ebf1f95b543dbe0de5311855b75e50176
This commit is contained in:
committed by
Andreas Enge
parent
20e84de011
commit
bd2464fc7c
+17
-16
@@ -3592,23 +3592,24 @@ can solve two kinds of problems:
|
||||
(variable "CURLOPT_CAPATH")
|
||||
(files '("etc/ssl/certs")))))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-shell="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh")
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list (string-append "--with-shell="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh")
|
||||
|
||||
;; XXX: Without this flag, linking octave-cli fails with
|
||||
;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to
|
||||
;; not pulling in liboctinterp.la for -lstdc++.
|
||||
"--enable-link-all-dependencies")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'configure 'configure-makeinfo
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "libinterp/corefcn/help.h"
|
||||
(("\"makeinfo\"")
|
||||
(string-append
|
||||
"\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\""))))))))
|
||||
;; XXX: Without this flag, linking octave-cli fails with
|
||||
;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to
|
||||
;; not pulling in liboctinterp.la for -lstdc++.
|
||||
"--enable-link-all-dependencies")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'configure 'configure-makeinfo
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "libinterp/corefcn/help.h"
|
||||
(("\"makeinfo\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "bin/makeinfo")))))))))
|
||||
(home-page "https://www.gnu.org/software/octave/")
|
||||
(synopsis "High-level language for numerical computation (no GUI)")
|
||||
(description "GNU Octave is a high-level interpreted language that is
|
||||
|
||||
Reference in New Issue
Block a user