summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2021-08-30 23:18:46 +0200
committerJakov Smolić <jsmolic@gentoo.org>2021-08-30 23:22:07 +0200
commit4709d8e4ea9ec149753b98cabf365b3520070d65 (patch)
tree695f8610fa83b09519434ab781afdcb283f4353a /sci-physics/espresso
parentdev-embedded/u-boot-tools: Version bump to 2021.07 (diff)
downloadgentoo-4709d8e4ea9ec149753b98cabf365b3520070d65.tar.gz
gentoo-4709d8e4ea9ec149753b98cabf365b3520070d65.tar.bz2
gentoo-4709d8e4ea9ec149753b98cabf365b3520070d65.zip
sci-physics/espresso: Fix build with gcc-11
* Call python_optimize for non byte-compiled modules * Builds with >=boost-1.75 versions Closes: https://bugs.gentoo.org/737534 Closes: https://bugs.gentoo.org/793011 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'sci-physics/espresso')
-rw-r--r--sci-physics/espresso/espresso-4.1.3.ebuild6
-rw-r--r--sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch37
2 files changed, 43 insertions, 0 deletions
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 19e9be04e85a..4c60379b475a 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -49,6 +49,10 @@ DOCS=( AUTHORS NEWS README ChangeLog )
S="${WORKDIR}/${PN}"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-11.patch
+)
+
src_prepare() {
use cuda && cuda_src_prepare
cmake_src_prepare
@@ -79,6 +83,8 @@ src_install() {
cmake_src_install
+ python_optimize
+
insinto /usr/share/${PN}/
doins "${BUILD_DIR}/myconfig-sample.hpp"
diff --git a/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch b/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
new file mode 100644
index 000000000000..fcda88e9b8b8
--- /dev/null
+++ b/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
@@ -0,0 +1,37 @@
+https://src.fedoraproject.org/rpms/espresso/blob/f34/f/espresso-gcc11.patch
+--- a/src/core/communication.hpp
++++ b/src/core/communication.hpp
+@@ -49,6 +49,8 @@
+ * to \ref CALLBACK_LIST.
+ */
+
++#include <cstddef>
++
+ #include "MpiCallbacks.hpp"
+
+ /* Includes needed by callbacks. */
+diff --git a/src/script_interface/ParallelScriptInterface.hpp b/src/script_interface/ParallelScriptInterface.hpp
+index c33e67d..02ad815 100644
+--- a/src/script_interface/ParallelScriptInterface.hpp
++++ b/src/script_interface/ParallelScriptInterface.hpp
+@@ -23,6 +23,7 @@
+ #define SCRIPT_INTERFACE_PARALLEL_SCRIPT_INTERFACE_HPP
+
+ #include <utility>
++#include <limits>
+
+ #include "MpiCallbacks.hpp"
+ #include "ScriptInterface.hpp"
+diff --git a/src/utils/include/utils/NumeratedContainer.hpp b/src/utils/include/utils/NumeratedContainer.hpp
+index 1d99098..1191a79 100644
+--- a/src/utils/include/utils/NumeratedContainer.hpp
++++ b/src/utils/include/utils/NumeratedContainer.hpp
+@@ -24,6 +24,7 @@
+ * Keep an enumerated list of T objects, managed by the class.
+ */
+
++#include <cstddef>
+ #include <cassert>
+ #include <set>
+ #include <unordered_map>
+