* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/
@ 2021-01-20 10:16 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-01-20 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 33ec5c643cea8bc391875f2b5fc38090f3726fe4
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:06 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ec5c64
sci-physics/geant: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/geant/Manifest | 4 -
sci-physics/geant/files/geant-4.10.6-datadir.patch | 159 ---------------------
sci-physics/geant/geant-4.10.6-r1.ebuild | 108 --------------
sci-physics/geant/geant-4.10.6.3.ebuild | 113 ---------------
sci-physics/geant/geant-4.10.6_p1-r1.ebuild | 108 --------------
sci-physics/geant/geant-4.10.6_p2.ebuild | 106 --------------
6 files changed, 598 deletions(-)
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2aadd1760dc..30465aa34b0 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,5 +1 @@
-DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0
-DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80 SHA512 bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20
-DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B 75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765 SHA512 844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69
-DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
diff --git a/sci-physics/geant/files/geant-4.10.6-datadir.patch b/sci-physics/geant/files/geant-4.10.6-datadir.patch
deleted file mode 100644
index c26bf8914b4..00000000000
--- a/sci-physics/geant/files/geant-4.10.6-datadir.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 44966c44635debaddd859c788b008cd4e6c7fab6 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Fri, 13 Mar 2020 15:36:27 +0100
-Subject: [PATCH] Allow customization of CMAKE_INSTALL_DATADIR
-
----
- cmake/Modules/G4CMakeMain.cmake | 2 +-
- cmake/Modules/G4ConfigureGNUMakeHelpers.cmake | 20 +++++++++----------
- cmake/Modules/Geant4InstallData.cmake | 4 ++--
- source/analysis/CMakeLists.txt | 2 +-
- source/analysis/g4tools/CMakeLists.txt | 2 +-
- 5 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/Modules/G4CMakeMain.cmake b/cmake/Modules/G4CMakeMain.cmake
-index a6b984fcad..5ab63202ca 100644
---- a/cmake/Modules/G4CMakeMain.cmake
-+++ b/cmake/Modules/G4CMakeMain.cmake
-@@ -121,7 +121,7 @@ mark_as_advanced(GEANT4_INSTALL_EXAMPLES)
-
- if(GEANT4_INSTALL_EXAMPLES)
- install(DIRECTORY examples
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}
- COMPONENT Examples
- PATTERN "CVS" EXCLUDE
- PATTERN ".svn" EXCLUDE
-diff --git a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-index c2aeefee59..1052f43a45 100644
---- a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-+++ b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-@@ -729,7 +729,7 @@ _g4tc_configure_build_tree_scripts(geant4make)
- # +- CMAKE_INSTALL_PREFIX
- # +- LIBDIR/Geant4-VERSION (G4LIB)
- # +- INCLUDEDIR/Geant4 (G4INCLUDE)
--# +- DATAROOTDIR/Geant4-VERSION/
-+# +- DATADIR/
- # +- geant4make (THIS IS G4INSTALL!)
- # +- geant4make.(c)sh
- # +- config/
-@@ -742,7 +742,7 @@ set(G4INSTALL "\"\$geant4make_root\"")
- # - Include dir
- file(RELATIVE_PATH
- G4MAKE_TO_INCLUDEDIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}
- )
- set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pwd`\"")
-@@ -750,7 +750,7 @@ set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pw
- # - Bin dir
- file(RELATIVE_PATH
- G4MAKE_TO_BINDIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${CMAKE_INSTALL_FULL_BINDIR}
- )
- set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"")
-@@ -758,7 +758,7 @@ set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"
- # - Lib dir
- file(RELATIVE_PATH
- G4MAKE_TO_LIBDIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${CMAKE_INSTALL_FULL_LIBDIR}
- )
- set(G4LIB "\"`cd \$geant4make_root/${G4MAKE_TO_LIBDIR}/Geant4-${Geant4_VERSION} > /dev/null \; pwd`\"")
-@@ -775,7 +775,7 @@ foreach(_ds ${GEANT4_EXPORTED_DATASETS})
-
- file(RELATIVE_PATH
- G4MAKE_TO_DATADIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${${_ds}_PATH}
- )
- set(${_ds}_PATH "\"`cd \$geant4make_root/${G4MAKE_TO_DATADIR} > /dev/null \; pwd`\"")
-@@ -788,7 +788,7 @@ set(TOOLS_FONT_PATH "\"`cd \$geant4make_root/../fonts > /dev/null ; pwd`\"")
- _g4tc_configure_install_tree_scripts(
- ${CMAKE_BINARY_DIR}/InstallTreeFiles
- geant4make
-- ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_DATADIR}/geant4make
- )
-
-
-@@ -797,7 +797,7 @@ _g4tc_configure_install_tree_scripts(
- # softlink to the G4SYSTEM directory.
- #
- install(DIRECTORY config
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/geant4make
- COMPONENT Development
- FILES_MATCHING PATTERN "*.gmk"
- PATTERN "CVS" EXCLUDE
-@@ -845,11 +845,11 @@ endforeach()
-
- # - Fonts
- file(RELATIVE_PATH
-- G4ENV_BINDIR_TO_DATAROOTDIR
-+ G4ENV_BINDIR_TO_DATADIR
- "${CMAKE_INSTALL_FULL_BINDIR}"
-- "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}"
-+ "${CMAKE_INSTALL_FULL_DATADIR}"
- )
--set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATAROOTDIR}/fonts > /dev/null ; pwd`\"")
-+set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATADIR}/fonts > /dev/null ; pwd`\"")
-
-
- # - Configure for each shell
-diff --git a/cmake/Modules/Geant4InstallData.cmake b/cmake/Modules/Geant4InstallData.cmake
-index 496b0fc4df..55536e51d4 100644
---- a/cmake/Modules/Geant4InstallData.cmake
-+++ b/cmake/Modules/Geant4InstallData.cmake
-@@ -105,7 +105,7 @@ set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
- set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)
-
- # Where to install data in the install tree (a Default)
--set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}/data")
-+set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATADIR}/data")
-
- # File containing dataset list
- set(GEANT4_DATASETS_DEFINITIONS "Geant4DatasetDefinitions")
-@@ -596,7 +596,7 @@ endfunction()
- # Choose Physics Data Install Dir
- # This follows the pattern for interface and setting as in GNUInstallDirs
- if(NOT GEANT4_INSTALL_DATADIR)
-- set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATAROOTDIR/${GEANT4_INSTALL_DATADIR_DEFAULT}")
-+ set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATADIR/data")
- set(GEANT4_INSTALL_DATADIR "${GEANT4_INSTALL_DATADIR_DEFAULT}")
- endif()
-
-diff --git a/source/analysis/CMakeLists.txt b/source/analysis/CMakeLists.txt
-index 44fa4a97be..4c40c704be 100644
---- a/source/analysis/CMakeLists.txt
-+++ b/source/analysis/CMakeLists.txt
-@@ -67,7 +67,7 @@ endif()
- #
- if (GEANT4_USE_FREETYPE)
- install(DIRECTORY fonts/
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/fonts
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/fonts
- PATTERN ".svn" EXCLUDE
- )
- endif()
-diff --git a/source/analysis/g4tools/CMakeLists.txt b/source/analysis/g4tools/CMakeLists.txt
-index 54c72f1297..df87582bc1 100644
---- a/source/analysis/g4tools/CMakeLists.txt
-+++ b/source/analysis/g4tools/CMakeLists.txt
-@@ -43,7 +43,7 @@ install(DIRECTORY include/
- # We also need to install the tools license
- #
- install(FILES tools.license
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}
- )
-
- #------------------------------------------------------------------------------
---
-2.25.1
-
diff --git a/sci-physics/geant/geant-4.10.6-r1.ebuild b/sci-physics/geant/geant-4.10.6-r1.ebuild
deleted file mode 100644
index 59fedc8d7cc..00000000000
--- a/sci-physics/geant/geant-4.10.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*_p*)
- MY_P+=.p$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-*)
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-${PV} )
- dawn? ( media-gfx/dawn )
- doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake-utils_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.6.3.ebuild b/sci-physics/geant/geant-4.10.6.3.ebuild
deleted file mode 100644
index 2339a156d89..00000000000
--- a/sci-physics/geant/geant-4.10.6.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*)
- if [[ $(ver_cut 4) -gt 0 ]]; then
- MY_P+=.p$(printf %02d $(ver_cut 4))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- fi
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
- ^^ ( c++11 c++14 c++17 )
- inventor? ( opengl )
- motif? ( opengl )
- qt5? ( opengl )
-"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-${PV} )
- dawn? ( media-gfx/dawn )
- doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_STORE_TRAJECTORY=OFF
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_BUILD_VERBOSE_CODE=OFF
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_INSTALL_PACKAGE_CACHE=OFF
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
deleted file mode 100644
index 59fedc8d7cc..00000000000
--- a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*_p*)
- MY_P+=.p$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-*)
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-${PV} )
- dawn? ( media-gfx/dawn )
- doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake-utils_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.6_p2.ebuild b/sci-physics/geant/geant-4.10.6_p2.ebuild
deleted file mode 100644
index b266de392cd..00000000000
--- a/sci-physics/geant/geant-4.10.6_p2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*_p*)
- MY_P+=.p$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-*)
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-4.10.6_p1 )
- dawn? ( media-gfx/dawn )
- doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake-utils_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/
@ 2021-08-23 11:48 Guilherme Amadio
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme Amadio @ 2021-08-23 11:48 UTC (permalink / raw
To: gentoo-commits
commit: d18c2c2350f97e4eec032d01c672f6ced09cc2fa
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 11:47:43 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 11:48:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18c2c23
sci-physics/geant: fix build with CMake 3.20 and above
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/geant/files/geant4.10.7-hdf5.patch | 70 ++++++++++++++++++++++
...ant-4.10.7-r2.ebuild => geant-4.10.7-r3.ebuild} | 2 +
...4.10.7.1-r2.ebuild => geant-4.10.7.1-r3.ebuild} | 2 +
...4.10.7.2-r2.ebuild => geant-4.10.7.2-r3.ebuild} | 2 +
...eta1-r1.ebuild => geant-4.11.0_beta1-r2.ebuild} | 2 +
5 files changed, 78 insertions(+)
diff --git a/sci-physics/geant/files/geant4.10.7-hdf5.patch b/sci-physics/geant/files/geant4.10.7-hdf5.patch
new file mode 100644
index 00000000000..679cdfbed9d
--- /dev/null
+++ b/sci-physics/geant/files/geant4.10.7-hdf5.patch
@@ -0,0 +1,70 @@
+From 4e86e523e7f0e419b990520a15ef7d524102cd06 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@gentoo.org>
+Date: Mon, 23 Aug 2021 13:18:25 +0200
+Subject: [PATCH] Rename Geant4::HDF5 to hdf5::hdf5
+
+Needed to be compatible with CMake 3.20, which now provides imported
+targets for HDF5 (https://cmake.org/cmake/help/v3.20/module/FindHDF5.html).
+---
+ cmake/Modules/G4HDF5Shim.cmake | 16 ++++++++--------
+ cmake/Modules/G4OptionalComponents.cmake | 2 +-
+
+diff --git a/cmake/Modules/G4HDF5Shim.cmake b/cmake/Modules/G4HDF5Shim.cmake
+index 963a7bb5be..97d97248d8 100644
+--- a/cmake/Modules/G4HDF5Shim.cmake
++++ b/cmake/Modules/G4HDF5Shim.cmake
+@@ -1,10 +1,10 @@
+- # - G4HDF5Shim
++# - G4HDF5Shim
+ #
+ # Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
+ # The HDF5 dependency is located through CMake's builtin FindHDF5
+-# module, but this does not supply imported targets as of CMake 3.16.
++# module, but this does not supply imported targets until CMake 3.20.
+ # It may use HDF5's hdf5-config.cmake file if available, so create
+-# custom imported target Geant4::HDF5 to allow both cases to be handled
++# custom imported target hdf5::hdf5 to allow both cases to be handled
+ # without interference with either.
+
+ if(HDF5_FOUND)
+@@ -24,18 +24,18 @@ if(HDF5_FOUND)
+ endif()
+ endif()
+
+- # As FindHDF5 does not yet supply imported targets, we
++ # If FindHDF5 does not yet supply imported targets, we
+ # create an internal INTERFACE target to wrap these.
+ # This still hard-codes include/library paths, but limits it
+ # to one place. Later, we'll create proper imported targets
+ # with re-finds but for now this is the best minimally invasive proceedure
+- if(NOT TARGET Geant4::HDF5)
+- add_library(Geant4::HDF5 IMPORTED UNKNOWN)
+- set_target_properties(Geant4::HDF5 PROPERTIES
++ if(NOT TARGET hdf5::hdf5)
++ add_library(hdf5::hdf5 IMPORTED UNKNOWN)
++ set_target_properties(hdf5::hdf5 PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
+ INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
+ INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
+ )
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/cmake/Modules/G4OptionalComponents.cmake b/cmake/Modules/G4OptionalComponents.cmake
+index c0639a538b..77b3c91241 100644
+--- a/cmake/Modules/G4OptionalComponents.cmake
++++ b/cmake/Modules/G4OptionalComponents.cmake
+@@ -369,7 +369,7 @@ if(GEANT4_USE_HDF5)
+ find_package(HDF5 1.8 REQUIRED)
+ include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
+ # Backward compatibility
+- set(HDF5_LIBRARIES Geant4::HDF5)
++ set(HDF5_LIBRARIES hdf5::hdf5)
+
+ # May have found via config mode...
+ if(HDF5_DIR)
+--
+2.33.0
+
diff --git a/sci-physics/geant/geant-4.10.7-r2.ebuild b/sci-physics/geant/geant-4.10.7-r3.ebuild
similarity index 98%
rename from sci-physics/geant/geant-4.10.7-r2.ebuild
rename to sci-physics/geant/geant-4.10.7-r3.ebuild
index fcc83668274..085e5abcf44 100644
--- a/sci-physics/geant/geant-4.10.7-r2.ebuild
+++ b/sci-physics/geant/geant-4.10.7-r3.ebuild
@@ -62,6 +62,8 @@ RDEPEND="
x11-libs/libXmu
)"
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
diff --git a/sci-physics/geant/geant-4.10.7.1-r2.ebuild b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
similarity index 98%
rename from sci-physics/geant/geant-4.10.7.1-r2.ebuild
rename to sci-physics/geant/geant-4.10.7.1-r3.ebuild
index fcc83668274..085e5abcf44 100644
--- a/sci-physics/geant/geant-4.10.7.1-r2.ebuild
+++ b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
@@ -62,6 +62,8 @@ RDEPEND="
x11-libs/libXmu
)"
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
diff --git a/sci-physics/geant/geant-4.10.7.2-r2.ebuild b/sci-physics/geant/geant-4.10.7.2-r3.ebuild
similarity index 98%
rename from sci-physics/geant/geant-4.10.7.2-r2.ebuild
rename to sci-physics/geant/geant-4.10.7.2-r3.ebuild
index 2b4f8cd92a1..32f62303ec7 100644
--- a/sci-physics/geant/geant-4.10.7.2-r2.ebuild
+++ b/sci-physics/geant/geant-4.10.7.2-r3.ebuild
@@ -62,6 +62,8 @@ RDEPEND="
x11-libs/libXmu
)"
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
diff --git a/sci-physics/geant/geant-4.11.0_beta1-r1.ebuild b/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild
similarity index 98%
rename from sci-physics/geant/geant-4.11.0_beta1-r1.ebuild
rename to sci-physics/geant/geant-4.11.0_beta1-r2.ebuild
index 19e28827a13..0b9fdfbf25e 100644
--- a/sci-physics/geant/geant-4.11.0_beta1-r1.ebuild
+++ b/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild
@@ -62,6 +62,8 @@ RDEPEND="
x11-libs/libXmu
)"
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/
@ 2022-09-14 14:55 Guilherme Amadio
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme Amadio @ 2022-09-14 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 144edbafdebe29ac1d2d3edede2385364d740ea6
Author: listout <listout <AT> protonmail <DOT> com>
AuthorDate: Tue Sep 13 10:20:17 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 14:54:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144edbaf
sci-physics/geant: Fix building on musl, avoid execinfo.h
Avoid including execinfo.h and calling backtrace function on system that
don't provide the header.
Closes: https://bugs.gentoo.org/829151
Closes: https://github.com/gentoo/gentoo/pull/26313
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
.../files/geant-4.11.0.2-musl-avoid-execinfo.patch | 100 +++++++++++++++++++++
sci-physics/geant/geant-4.11.0.2-r1.ebuild | 4 +
2 files changed, 104 insertions(+)
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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-14 14:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-23 11:48 [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2022-09-14 14:55 Guilherme Amadio
2021-01-20 10:16 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox