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-boost.patch | |
| parent | dd823172d86f82dedf8b0a7eb65925db4b164d26 (diff) | |
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-boost.patch')
| -rw-r--r-- | gnu/packages/patches/fenics-dolfin-boost.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/gnu/packages/patches/fenics-dolfin-boost.patch b/gnu/packages/patches/fenics-dolfin-boost.patch new file mode 100644 index 0000000000..de56ebb9b3 --- /dev/null +++ b/gnu/packages/patches/fenics-dolfin-boost.patch @@ -0,0 +1,45 @@ +The `BOOST_LITTLE_ENDIAN` and `BOOST_BIG_ENDIAN` macros, along with the +"boost/detail/endian.hpp" header, were deprecated in boost 1.69.0 and finally +removed in boost 1.73.0. They are superseded by the BOOST_ENDIAN_LITTLE_BYTE +and BOOST_ENDIAN_BIG_BYTE macros and "boost/predef/other/endian.h" header. + +Deprecated: https://github.com/boostorg/predef/commit/32d4581c1689370444f2e565cfbb8421d5071807 +Removed: https://github.com/boostorg/predef/commit/aa6e232bf170ad8b856aff9e7c70334f77441c7f + +Adaptation of patch from https://bitbucket.org/fenics-project/dolfin/issues/1116 + +--- a/dolfin/io/VTKFile.cpp ++++ b/dolfin/io/VTKFile.cpp +@@ -20,7 +20,7 @@ + #include <vector> + #include <iomanip> + #include <boost/cstdint.hpp> +-#include <boost/detail/endian.hpp> ++#include <boost/predef/other/endian.h> + + #include "pugixml.hpp" + +@@ -614,9 +614,9 @@ + std::string endianness = ""; + if (encode_string == "binary") + { +- #if defined BOOST_LITTLE_ENDIAN ++ #if defined BOOST_ENDIAN_LITTLE_BYTE + endianness = "byte_order=\"LittleEndian\""; +- #elif defined BOOST_BIG_ENDIAN ++ #elif defined BOOST_ENDIAN_BIG_BYTE + endianness = "byte_order=\"BigEndian\"";; + #else + dolfin_error("VTKFile.cpp", + +--- a/dolfin/io/VTKWriter.cpp ++++ b/dolfin/io/VTKWriter.cpp +@@ -24,7 +24,6 @@ + #include <sstream> + #include <vector> + #include <iomanip> +-#include <boost/detail/endian.hpp> + + #include <dolfin/fem/GenericDofMap.h> + #include <dolfin/fem/FiniteElement.h> +
\ No newline at end of file |