aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/maths.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-04-05 22:45:15 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-04-05 22:45:15 +0200
commita533c5a1835cbeafaf595c4474e2ce6adde7de8d (patch)
tree4c6f1fc166d47b0868df2cbdc13cca67e45dfa45 /gnu/packages/maths.scm
parent41cb710f4a400e67914a2b51bd204184f2889308 (diff)
downloadguix-a533c5a1835cbeafaf595c4474e2ce6adde7de8d.tar
guix-a533c5a1835cbeafaf595c4474e2ce6adde7de8d.tar.gz
gnu: octave-cli: Fix build.
* gnu/packages/maths.scm (octave-cli)[inputs]: Add LIBJPEG-TURBO. [arguments]: Add "--enable-link-all-dependencies" in #:configure-flags.
Diffstat (limited to 'gnu/packages/maths.scm')
-rw-r--r--gnu/packages/maths.scm13
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6d7625cfc1..07a19d4927 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1586,6 +1586,12 @@ can solve two kinds of problems:
("glpk" ,glpk)
("glu" ,glu)
("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)
("lapack" ,lapack)
("libsndfile" ,libsndfile)
@@ -1624,7 +1630,12 @@ can solve two kinds of problems:
`(#:configure-flags
(list (string-append "--with-shell="
(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
(modify-phases %standard-phases
(add-after 'configure 'configure-makeinfo