diff options
| author | Eric Bavier <bavier@posteo.net> | 2022-02-04 23:13:57 -0600 |
|---|---|---|
| committer | Eric Bavier <bavier@posteo.net> | 2022-02-05 00:24:33 -0600 |
| commit | 41b11c459bda26b0a7c20ef39486eef917416860 (patch) | |
| tree | 61f638bc9749769703b5b2702e5eed235fde3c34 /gnu/packages/patches/fenics-dolfin-algorithm.patch | |
| parent | dd823172d86f82dedf8b0a7eb65925db4b164d26 (diff) | |
| download | guix-41b11c459bda26b0a7c20ef39486eef917416860.tar.gz | |
gnu: fenics-dolfin: Fix build.
* gnu/packages/patches/fenics-dolfin-algorithm.patch, gnu/packages/patches/fenics-dolfin-boost.patch, gnu/packages/patches/fenics-dolfin-config-slepc.patch, gnu/packages/patches/fenics-dolfin-demo-init.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/simulation.scm (fenics-dolfin)[source]: Use them.
Diffstat (limited to 'gnu/packages/patches/fenics-dolfin-algorithm.patch')
| -rw-r--r-- | gnu/packages/patches/fenics-dolfin-algorithm.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/gnu/packages/patches/fenics-dolfin-algorithm.patch b/gnu/packages/patches/fenics-dolfin-algorithm.patch new file mode 100644 index 0000000000..e2a3148a64 --- /dev/null +++ b/gnu/packages/patches/fenics-dolfin-algorithm.patch @@ -0,0 +1,37 @@ +Fix compilation errors: + + dolfin/geometry/IntersectionConstruction.cpp: In static member function ‘static std::vector<dolfin::Point> dolfin::IntersectionConstruction::intersection_segment_segment_2d(const dolfin::Point&, const dolfin::Point&, const dolfin::Point&, const dolfin::Point&)’: + dolfin/geometry/IntersectionConstruction.cpp:442:24: error: ‘min_element’ is not a member of ‘std’; did you mean ‘tuple_element’? + 442 | const auto it = std::min_element(oo.begin(), oo.end()); + | ^~~~~~~~~~~ + | tuple_element + + dolfin/mesh/MeshFunction.h: In member function ‘std::vector<long unsigned int> dolfin::MeshFunction<T>::where_equal(T)’: + dolfin/mesh/MeshFunction.h:652:26: error: ‘count’ is not a member of ‘std’; did you mean ‘cout’? + 652 | std::size_t n = std::count(_values.get(), _values.get() + _size, value); + | ^~~~~ + | cout + +Submitted upstream at https://bitbucket.org/fenics-project/dolfin/issues/1128 + +--- a/dolfin/geometry/IntersectionConstruction.cpp ++++ b/dolfin/geometry/IntersectionConstruction.cpp +@@ -18,7 +18,8 @@ + // First added: 2014-02-03 + // Last changed: 2017-12-12 + ++#include <algorithm> + #include <iomanip> + #include <dolfin/mesh/MeshEntity.h> + #include "predicates.h" + +--- a/dolfin/mesh/MeshFunction.h ++++ b/dolfin/mesh/MeshFunction.h +@@ -24,6 +24,7 @@ + #ifndef __MESH_FUNCTION_H + #define __MESH_FUNCTION_H + ++#include <algorithm> + #include <map> + #include <vector> + |