gentoo auto-resync : 14:09:2022 - 17:11:02

3 files changed, 106 insertions, 1 deletions

diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 6c6dc80c2626..b4334a1a2d38 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,7 +1,8 @@
+AUX geant-4.11.0.2-musl-avoid-execinfo.patch 2812 BLAKE2B 7bede49a061f174d2cd3ad9176db104dc8dd4e8253949412d9b8b749d860fae8d27b29b64f817d0051785d2f657e0a46f9567fd06093e6a1e1aaf8925761b2f3 SHA512 d16ea93357e62571344a26ad8162a50333f0822a4eda9e3d349d9ac8041e39555face07d25382e1f4e53ca5256dbdd213248af329ce5f0d1739ce95cd99add22
 DIST geant4-v11.0.1.tar.gz 35643646 BLAKE2B 52af009440d70aa1547d07e4367266a4e02561d0d5d509399db94ce8dcf41d491085b8de908efee7fbe3e7324963f57c9e36e1beeed9a6cef42d327b2f2201a0 SHA512 d189e6aca04dfa6a7a371f2273105d7fb80719c9e1cade7c170ff350d22db5cb33cbfece4c1f8c4d5a374a048bb95f6e9fcd37b03a3a7c2d946e046c4ea608fa
 DIST geant4-v11.0.2.tar.gz 35636883 BLAKE2B f22c68cf4c4c9d68d24c98251198804d5790b500ed9077a06ffe5fcc7d84447befc15c93e57f725e68915ff97e7ce022c7f7f5678ceea593aacb231294affa3e SHA512 e7e98242787d1e37303dac54c763e659682adf5c86d30dcefb6c22a7360ba837591c11fb5787a56219461913db786e408f4a344e7ace8ca39cbb8b65b1e23ede
 DIST geant4.10.07.p03.tar.gz 35756099 BLAKE2B 9e510d17173d280a24d2540d0e0f25f7337a410858c30e9281b937a8402cbc0acd022cc6f41cc3b88fec28b53fa8a266d79e90bfb6545f4ecffe0724e36183da SHA512 174e4f37ca977eff89bbd8f72f18ef5534db72d966665b9a837ed26acffa527d45741fd38fde460f0719c8962dc2ee33db1f3dfe065a7d0e74c148e4582c095c
 EBUILD geant-4.10.7.3.ebuild 2977 BLAKE2B 9cc044c0122abe4817069e694dd2e5d9a097047a7953243b6f3a5c4fc42fdc02c1d744b273df7763bee6c9751825c0e99fe89f932359902acf8d6a69fd72ee76 SHA512 ebe32fedd0fb593ec393861ea277bf77a9f49d50fa432b2e3191a35ce213108ec2bd2105a5aa9fb2add7c6dbf01dc2c048e8515676d3aef031970afe1978f6eb
 EBUILD geant-4.11.0.1-r1.ebuild 3419 BLAKE2B 93bbe0d69869fbc6b5a305d7fd5aba2d53f209c1b5f61fa0cf7b6a560699580bf3d7d7d982e5db1b49adafda51709c2e59c447b023e8df9e91c4bebeff88a716 SHA512 b5b00bd23629e444880942db4748fe4ffae504141c06e2e19c33dbaf09899afe4ca8307805425ed38219fd92d3d45513ef53360caef5d8799946e00cff03d359
-EBUILD geant-4.11.0.2-r1.ebuild 3420 BLAKE2B bfb5a9c7830a7edba74f73e801bbf4e9a6f44a3e5d52994cf8f22bd4e7a5ed2b173fcbcbeeabf08fc9018f181b8e221967f48f976359655b166ad73c37af40f2 SHA512 ecae4f34f12dc27d6d37ea7c08b702e10c7dba95a4f3b0a8d134834a1e98aef1192b5ed48a769fe38d70c332a9aaee1b38528ae9deb77bc2a8c668c7935ca6d8
+EBUILD geant-4.11.0.2-r1.ebuild 3489 BLAKE2B d99404345102af41947ae99940a313bc933c1afbd4b0345950b4851f46507e258b74533557cc23e82fda816d1b9243e8020e85d6b4cdcba2999fcb9a2b12c081 SHA512 6cf7877a6b4f5d88b286866909857c402528333e549b9f1787c67fbbdec56347f8b66451d71f982b87fba316b32f377c457b49ef3c97dff95852a2a62a21e113
 MISC metadata.xml 1776 BLAKE2B 74ebef8d1d7ef17c516b71eeb1a901b9a1692633ba876c15c72163128f20a14b9c2fad760a21676ea81322b281d8f67de9b8b67ffccda6a1a6872f47b7022aec SHA512 1bf55d45afb8cead41c8984e029019beaba353483491c770b16f5f6f9e0b600950222104e7c157348ac11cacd098da886dc9d3053a04748cf237a45dc23326a1
diff --git a/sci-physics/geant/files/geant-4.11.0.2-musl-avoid-execinfo.patch b/sci-physics/geant/files/geant-4.11.0.2-musl-avoid-execinfo.patch
new file mode 100644
index 000000000000..e73a9c24c597
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.11.0.2-musl-avoid-execinfo.patch
@@ -0,0 +1,100 @@
+# Avoid including execinfo and calling backtrace function when execinfo.h is
+# not present or supplied by system's libc
+#
+# Closes: https://bugs.gentoo.org/829151
+--- a/source/global/management/include/G4Backtrace.hh
++++ b/source/global/management/include/G4Backtrace.hh
+@@ -85,23 +85,6 @@
+ #  endif
+ #endif
+
+-#if defined(G4UNIX) && !defined(WIN32)
+-#  include <cxxabi.h>
+-#  include <execinfo.h>
+-#  include <unistd.h>
+-#endif
+-
+-#if defined(G4LINUX)
+-#  include <features.h>
+-#endif
+-
+-#include <cfenv>
+-#include <csignal>
+-#include <type_traits>
+-
+-template <typename FuncT, typename... ArgTypes>
+-using G4ResultOf_t = std::invoke_result_t<FuncT, ArgTypes...>;
+-
+ // compatible OS and compiler
+ #if defined(G4UNIX) &&                                                         \
+   (defined(__GNUC__) || defined(__clang__) || defined(_INTEL_COMPILER))
+@@ -109,7 +92,9 @@ using G4ResultOf_t = std::invoke_result_t<FuncT, ArgTypes...>;
+ #    define G4SIGNAL_AVAILABLE
+ #  endif
+ #  if !defined(G4DEMANGLE_AVAILABLE)
+-#    define G4DEMANGLE_AVAILABLE
++#    if defined(G4UNIX) && defined(HAVE_EXECINFO_H)
++#       define G4DEMANGLE_AVAILABLE
++#    endif
+ #  endif
+ #endif
+
+@@ -121,6 +106,25 @@ using G4ResultOf_t = std::invoke_result_t<FuncT, ArgTypes...>;
+ #  endif
+ #endif
+
++#if defined(G4UNIX) && !defined(WIN32)
++#  include <cxxabi.h>
++#if defined(HAVE_EXECINFO_H)
++#  include <execinfo.h>
++#endif
++#  include <unistd.h>
++#endif
++
++#if defined(G4LINUX)
++#  include <features.h>
++#endif
++
++#include <cfenv>
++#include <csignal>
++#include <type_traits>
++
++template <typename FuncT, typename... ArgTypes>
++using G4ResultOf_t = std::invoke_result_t<FuncT, ArgTypes...>;
++
+ //----------------------------------------------------------------------------//
+
+ inline G4String G4Demangle(const char* _str)
+@@ -368,6 +372,7 @@ G4Backtrace::GetMangled(FuncT&& func)
+   std::array<type, Depth> btrace;
+   btrace.fill((std::is_pointer<type>::value) ? nullptr : type{});
+
++#if defined(G4DEMANGLE_AVAILABLE)
+   // plus one for this stack-frame
+   std::array<void*, Depth + Offset> buffer;
+   // size of returned buffer
+@@ -387,6 +392,7 @@ G4Backtrace::GetMangled(FuncT&& func)
+       btrace[i] = func(bsym[i]);
+     free(bsym);
+   }
++#endif
+   return btrace;
+ }
+
+--- a/source/global/management/sources.cmake
++++ b/source/global/management/sources.cmake
+@@ -6,6 +6,14 @@ set(G4MULTITHREADED ${GEANT4_BUILD_MULTITHREADED})
+ set(G4_STORE_TRAJECTORY ${GEANT4_BUILD_STORE_TRAJECTORY})
+ set(G4VERBOSE ${GEANT4_BUILD_VERBOSE_CODE})
+
++include(CheckIncludeFile)
++
++check_include_file(execinfo.h HAVE_EXECINFO_H)
++
++if(HAVE_SYS_TYPES_H)
++	list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_EXECINFO_H)
++endif()
++
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/include/G4GlobalConfig.hh.in
+   ${CMAKE_CURRENT_BINARY_DIR}/include/G4GlobalConfig.hh)
+
diff --git a/sci-physics/geant/geant-4.11.0.2-r1.ebuild b/sci-physics/geant/geant-4.11.0.2-r1.ebuild
index 1eaf3d9af34b..e43a735dfdc4 100644
--- a/sci-physics/geant/geant-4.11.0.2-r1.ebuild
+++ b/sci-physics/geant/geant-4.11.0.2-r1.ebuild
@@ -75,6 +75,10 @@ RDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"