From f7cbf403efa5368b5585f763262b152577339919 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Apr 2020 22:29:35 +0200 Subject: gnu: dune-istl: Fix build failure. * gnu/packages/maths.scm (dune-istl)[arguments]: Add phase 'hide-gfortran'. --- gnu/packages/maths.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e3d3216eab..08e0e7dd7a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4863,6 +4863,18 @@ (define-public dune-istl (arguments `(#:phases (modify-phases %standard-phases + ;; XXX: istl/test/matrixtest.cc includes and fails to find + ;; the stdlib types when the gfortran header is used. Remove gfortran + ;; from CPLUS_INCLUDE_PATH as a workaround. + (add-after 'set-paths 'hide-gfortran + (lambda* (#:key inputs #:allow-other-keys) + (let ((gfortran (assoc-ref inputs "gfortran"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gfortran "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")) + #t))) (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags)))))) -- cgit v1.2.3