summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorPaul A. Patience <paul@apatience.com>2023-10-12 10:02:25 -0400
committerLudovic Courtès <ludo@gnu.org>2023-10-21 00:27:26 +0200
commitfed6ac2ae182597a492b17a29ed8b26986498755 (patch)
tree085d6d159f779bd4d3143add0ad9358512c7adef /gnu/local.mk
parentc942f4dcaba8f44d9f89540c22825e935c5acfd1 (diff)
downloadguix-fed6ac2ae182597a492b17a29ed8b26986498755.tar.gz
gnu: trilinos-for-dealii-openmpi: Fix build.
This fixes the error

  error: ‘std::hypot’ has not been declared

caused by using an older version of gcc, but requires some patches to
placate newer versions of gcc.

* gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[origin]: Add
patches.
[native-inputs]: Remove gcc-7.
* gnu/packages/patches/teuchos-remove-duplicate-using.patch: New file.
* gnu/packages/patches/tpetra-remove-duplicate-using.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index bb801c59cd..9e74919ef8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2026,6 +2026,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/texinfo-5-perl-compat.patch		\
   %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch   \
   %D%/packages/patches/telegram-purple-adjust-test.patch	\
+  %D%/packages/patches/teuchos-remove-duplicate-using.patch	\
   %D%/packages/patches/texi2html-document-encoding.patch	\
   %D%/packages/patches/texi2html-i18n.patch			\
   %D%/packages/patches/thefuck-test-environ.patch		\
@@ -2036,6 +2037,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/tla2tools-build-xml.patch		\
   %D%/packages/patches/tlf-support-hamlib-4.2+.patch		\
   %D%/packages/patches/tofi-32bit-compat.patch			\
+  %D%/packages/patches/tpetra-remove-duplicate-using.patch	\
   %D%/packages/patches/transcode-ffmpeg.patch	\
   %D%/packages/patches/trytond-add-egg-modules-to-path.patch	\
   %D%/packages/patches/trytond-add-guix_trytond_path.patch	\