From 109bf6a0e7111a75a54924be8a58c0fbc9a55c7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Apr 2020 22:30:05 +0200 Subject: gnu: dune-localfunctions: Fix build failure. * gnu/packages/maths.scm (dune-localfunctions)[arguments]: Add phase 'hide-gfortran'. --- gnu/packages/maths.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 08e0e7dd7a..b814105a36 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4921,6 +4921,18 @@ aggregation-based algebraic multigrid.") (arguments `(#:phases (modify-phases %standard-phases + ;; XXX: localfunctions/test/lagrangeshapefunctiontest.cc includes + ;; and fails to find the stdlib types when the gfortran header is used. + ;; Hide gfortran from CPLUS_INCLUDE_PATH to ensure we get the GCC header. + (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