[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: gnu: netcdf-parallel-openmpi: Allow compilation with GCC 10.
From: |
guix-commits |
Subject: |
03/04: gnu: netcdf-parallel-openmpi: Allow compilation with GCC 10. |
Date: |
Sat, 11 Sep 2021 12:15:11 -0400 (EDT) |
civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit 7be2b83102e477133cfdb9db6eac266da8c6140f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Sep 11 17:05:23 2021 +0200
gnu: netcdf-parallel-openmpi: Allow compilation with GCC 10.
* gnu/packages/maths.scm (netcdf)[source]: Add 'modules' and 'snippet'.
---
gnu/packages/maths.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a21c709..b6fd5c9 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1667,6 +1667,13 @@ similar to MATLAB, GNU Octave or SciPy.")
(sha256
(base32
"1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Make sure this variable is defined only once. Failing to do so
+ ;; would break builds of 'netcdf-parallel-openmpi' with a
+ ;; multiple-definition link error with GCC 10.
+ '(substitute* "ncdump/ocprint.c"
+ (("^int ocdebug") "static int ocdebug")))
(patches (search-patches "netcdf-date-time.patch"))))
(build-system gnu-build-system)
(native-inputs