summaryrefslogtreecommitdiff
path: root/sci-physics
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-20 14:00:29 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-20 14:00:29 +0100
commit40a480a83a10d1718e26a6f4fc54d271c1f13a95 (patch)
treebfe08ce789f69c5862fd8e5d1bc17b22f9f21b86 /sci-physics
parent2eda3a3b8ebdb3fc8552feb6f49e466d3bc8e88c (diff)
gentoo auto-resync : 20:10:2022 - 14:00:29
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/Manifest.gzbin4192 -> 4184 bytes
-rw-r--r--sci-physics/root/Manifest6
-rw-r--r--sci-physics/root/root-6.26.08.ebuild (renamed from sci-physics/root/root-6.26.06.ebuild)5
-rw-r--r--sci-physics/root/root-6.26.9999.ebuild11
4 files changed, 9 insertions, 13 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index df19a5bf87a9..1d6c3fc489a0 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
Binary files differ
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index d3d541b82170..83259df3545c 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,8 +1,8 @@
AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
DIST root_v6.24.06.source.tar.gz 185205236 BLAKE2B 6b3343ad8d86373de3abd328480eaa89825bca46ebb5ccc16ddcb8c1060fa023eeb8be3d1832e3ce2ad0beaafe66334f20ed8344ffb6df72d89c6622aa1c947a SHA512 356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a
-DIST root_v6.26.06.source.tar.gz 195214157 BLAKE2B cb9f4b17f7eae36fbd728aa9c03a5705f5d05da0a9c0913fef6145d3fae4843f1a77b3f6251cd6cc322fa7ada4837c0be69aa53b2e1572c72e6e91d1b68aef47 SHA512 ae2b7396e0821adba6cad75346c0bfb1b7a0d4dd1cc4bc9b195c632358fe078949012b6269e55dabadc6ecd8c0fd6d819fa87099046d399ed00a45db56a879d4
+DIST root_v6.26.08.source.tar.gz 195225434 BLAKE2B e96870b701fbf25dd01c6ab1e39c40ee8fdce9bc6e58d2a6f48a8b3eae71b9eab0cef9a7a229d56efc00eb0d50f218eb2b26a2786641a484e4a08196007409c7 SHA512 5e8f7c6cbe0335a123e8154570582fcdbb1b6ca55ffd63c06e4d2bb85a03bb1a6b827f299b8aabff6699458cbf6bfecf5e4806889c43520a1df2cea12dde387b
EBUILD root-6.24.06-r2.ebuild 7807 BLAKE2B e668b379eeaf4050b66bb1453ea623faa2f4453f2c12c8a7fa1677a8eec8b02ca18a10f30b4e0ff7187e19222fde0af7cfdcdc258fef04eff581d44f4dac8e03 SHA512 91018bfd4b3a5fa8b230297cdc99c87b805227becfa6cf1dd3dc17cf0f155fe4675c8def38c59419208e192ba4e1e9ec128609e98c8269546a335dceb64bea0e
-EBUILD root-6.26.06.ebuild 8187 BLAKE2B c83b50e4249356f7d4682ecbf779d5dfd64e6dd9d94d2dd4cfe141e753574264d6a0ed43ef80dfe7f075819ba6eca4198fbb06fb7c664a3b48955841deb5afb9 SHA512 84d6fc0786de97ae44fe3d8f80796c157179e4c7d17784edb0ce0cd6de0af419222f99d92a640ee6e3a5e01f725a6c1b278b9a9ac6d7d3e4266c74c657e5d284
-EBUILD root-6.26.9999.ebuild 8238 BLAKE2B 1537890a86aa15e8b2f22a0cfb29ae3e7169344eebd7b0ba863da571647f85912e5140eabf6b567a6c97fd8c4c1dbedf87b8ab607ce90c08a15b506f30344994 SHA512 92dbd4b459a36adf5c04134c64aa6151a8f13400fa56a2dd8c2012ae8df30e187e3c538cac834f2ea237aa0bb17f2a865646663e8bb808eda26ad7ec0a152fe4
+EBUILD root-6.26.08.ebuild 8248 BLAKE2B 5b892cce2c4cae4d4b9d46e4b110747de873f1aa5f0add77bb0c9c4816549004e29f032d391a72a5ef516d76e9f7a0007c08dd0058679683a896751c4cdf62f0 SHA512 6837081fb6fc8ca7705a7edd44e2952c69359eb26ff9b0c4bcf49daa774bfc77dee164256e4f5261650c29626fba3d54a85a8eb97710f9fa1276de2ced59853d
+EBUILD root-6.26.9999.ebuild 8248 BLAKE2B 5b892cce2c4cae4d4b9d46e4b110747de873f1aa5f0add77bb0c9c4816549004e29f032d391a72a5ef516d76e9f7a0007c08dd0058679683a896751c4cdf62f0 SHA512 6837081fb6fc8ca7705a7edd44e2952c69359eb26ff9b0c4bcf49daa774bfc77dee164256e4f5261650c29626fba3d54a85a8eb97710f9fa1276de2ced59853d
EBUILD root-9999.ebuild 8459 BLAKE2B 424de2b18c5a063b68c979c585e795177b18b4407e079f32961d9590d049c7e06290d2bfa07b8c568a3b07192db78f5036d4932389840d84756b52bf44314487 SHA512 7b144b55152944f68b02d4c37633a389324a168d63c98fb06ee9e531eea12f561a63c6b8efe617234d76deb4ba6fd002227584c5e80f515b9ffe8c5b8523d487
MISC metadata.xml 3150 BLAKE2B eb4fbf007e655d2a0bc80d8ef608f0ba19324ddea1af595dfa4ff5115e8d62409be4bfbf262cd1e3d9a400bd4f658224aac40690bdae072a870f8e1739e481d3 SHA512 3f3ff439a879e22319e4b97dfbbd01fe62e36904a8152507553ead043833218d59b6ecf87c5ebed339fb36af6573e6a171469e8158364db1f2b92cca97dedff3
diff --git a/sci-physics/root/root-6.26.06.ebuild b/sci-physics/root/root-6.26.08.ebuild
index 32cd50caca05..a3a2a140ba5a 100644
--- a/sci-physics/root/root-6.26.06.ebuild
+++ b/sci-physics/root/root-6.26.08.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
app-arch/zstd
app-arch/xz-utils
fortran? ( dev-lang/cfortran )
- <dev-cpp/nlohmann_json-3.11
+ dev-cpp/nlohmann_json
dev-libs/libpcre:3
dev-libs/xxhash
media-fonts/dejavu
@@ -167,6 +167,8 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_C_COMPILER="$(tc-getCC)"
-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+ -DLLVM_BUILD_TYPE=$(usex debug RelWithDebInfo Release)
+ -DCMAKE_BUILD_TYPE=$(usex debug RelWithDebInfo Release)
-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
@@ -291,7 +293,6 @@ src_configure() {
${EXTRA_ECONF}
)
- CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
cmake_src_configure
}
diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild
index c1dddda91e80..a3a2a140ba5a 100644
--- a/sci-physics/root/root-6.26.9999.ebuild
+++ b/sci-physics/root/root-6.26.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# ninja does not work due to fortran
CMAKE_MAKEFILE_GENERATOR=emake
FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} ) # python3_11 fails to compile
inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs
@@ -167,6 +167,8 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_C_COMPILER="$(tc-getCC)"
-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+ -DLLVM_BUILD_TYPE=$(usex debug RelWithDebInfo Release)
+ -DCMAKE_BUILD_TYPE=$(usex debug RelWithDebInfo Release)
-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
@@ -291,16 +293,9 @@ src_configure() {
${EXTRA_ECONF}
)
- CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
cmake_src_configure
}
-src_compile() {
- # needed for hsimple.root
- addwrite /dev/random
- cmake_src_compile
-}
-
src_install() {
cmake_src_install