[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

[Jakov Smolić]

commit:     4709d8e4ea9ec149753b98cabf365b3520070d65
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 21:18:46 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 21:22:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4709d8e4

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 <AT> gentoo.org>

 sci-physics/espresso/espresso-4.1.3.ebuild         |  6 ++++
 .../espresso/files/espresso-4.1.3-gcc-11.patch     | 37 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 19e9be04e85..4c60379b475 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 00000000000..fcda88e9b8b
--- /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>
+