me
/
guix
Archived
1
0
Fork 0
Code

gnu: octave-cli: Fix build. 

* gnu/packages/maths.scm (octave-cli)[inputs]: Add LIBJPEG-TURBO.
[arguments]: Add "--enable-link-all-dependencies" in #:configure-flags.
master
Marius Bakke 2020-04-05 22:45:15 +02:00
parent 41cb710f4a
commit a533c5a183
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/maths.scm
View File

@ -1586,6 +1586,12 @@ can solve two kinds of problems:
("glpk" ,glpk) ("glpk" ,glpk)
("glu" ,glu) ("glu" ,glu)
("graphicsmagick" ,graphicsmagick) ("graphicsmagick" ,graphicsmagick)
;; TODO: libjpeg-turbo is indirectly required through libtiff. In
;; the next rebuild cycle, add an absolute reference for -ljpeg in
;; libtiff.la instead of having to provide it here.
("libjpeg" ,libjpeg-turbo)
("hdf5" ,hdf5) ("hdf5" ,hdf5)
("lapack" ,lapack) ("lapack" ,lapack)
("libsndfile" ,libsndfile) ("libsndfile" ,libsndfile)
@ -1624,7 +1630,12 @@ can solve two kinds of problems:
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-shell=" (list (string-append "--with-shell="
(assoc-ref %build-inputs "bash") (assoc-ref %build-inputs "bash")
"/bin/sh")) "/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 #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'configure 'configure-makeinfo (add-after 'configure 'configure-makeinfo