diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
| commit | e9d044d4b9b71200a96adfa280848858c0f468c9 (patch) | |
| tree | 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /sci-libs/trilinos | |
| parent | fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff) | |
gentoo resync : 13.11.2021
Diffstat (limited to 'sci-libs/trilinos')
| -rw-r--r-- | sci-libs/trilinos/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/trilinos/metadata.xml | 1 | ||||
| -rw-r--r-- | sci-libs/trilinos/trilinos-13.0.1-r1.ebuild | 22 |
3 files changed, 13 insertions, 14 deletions
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest index 69e76ebe9fbf..73efbe7d92b9 100644 --- a/sci-libs/trilinos/Manifest +++ b/sci-libs/trilinos/Manifest @@ -1,4 +1,4 @@ DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57 -EBUILD trilinos-13.0.1-r1.ebuild 6467 BLAKE2B 3f28139f1b9dd05dbd49f4130a0926c7810e87b01d21c10ca6d0b24419c9e577b1dfa562cd79ed0620594140940e9640732ad85246becb0303d3b6ee493b21a5 SHA512 6fe413563fd9e19f19cfc936cfbcd2dae12a0ca0a5dde6a8bb0824ca758bbf5a8c20fdf9eea53d52fb0b2aadf0aa0a7e9e67573d9f7766f930e12949bd58130e -MISC metadata.xml 2779 BLAKE2B 4212ae278c7c11c7e09211265d1bf199f0334497f27ae33f16801b04933d00e671d5ff6f4da9e5386a8c30eb489865825babd77fb9b88c1b364e4d10d8fb00db SHA512 8698269f9dd5bdae7e45b5df49ff2d1422d2ffb89b16d1f9f162a1e58b4e5cce68ff3e11385e0731816ec14033efe72abd867f7251fa46678ff139e957b75e22 +EBUILD trilinos-13.0.1-r1.ebuild 6342 BLAKE2B 2cc0a163be87af555ac3a5d729ef4a54cba57364ec50fd4cfb7d5ad1beefbccf6daba09ab0ebb4fc34675159b19dbfe6918bfe109ff614f0307a242507deea65 SHA512 3c889163359b0b706c543cfbd91dd2c835ceaae7a3dc37d5c123c91dc6ed59f73804aa92371503655313600ff46ae5e04ed2e8d7e628a38e43003e7a219bd33f +MISC metadata.xml 2701 BLAKE2B 3899b8aa8424eca96d406c0ae3d66d30ed0d44a2070c9e5844b456730b89d8017feba10c5c75e1bcd6d3649a6ba37d044fa14f2822eb883b2b72bdb1667c32c7 SHA512 888dc051b32d4b3e227d3cca17bf64ec5885169c59669944a522d5d304ea2a5fa19854524b48e61ae3bb6c8483e717329d6384836301b691f6de15f6d13ed114 diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml index 62bd13962cc5..8e99b0a5654f 100644 --- a/sci-libs/trilinos/metadata.xml +++ b/sci-libs/trilinos/metadata.xml @@ -17,7 +17,6 @@ of large-scale, complex multi-physics engineering and scientific problems. <use> <flag name="adolc">Add support for adolc (<pkg>sci-libs/adolc</pkg>)</flag> <flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag> - <flag name="boost">Add support for boost (<pkg>dev-libs/boost</pkg>)</flag> <flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag> <flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag> <flag name="eigen">Add support for eigen (<pkg>dev-cpp/eigen</pkg>)</flag> diff --git a/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild b/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild index 26a268958be3..2af37197c730 100644 --- a/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild +++ b/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake-utils toolchain-funcs multilib +inherit cmake toolchain-funcs multilib DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/" @@ -18,7 +18,7 @@ LICENSE="BSD LGPL-2.1" SLOT="0" IUSE=" - adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre + adolc arprec clp cuda eigen glpk gtest hdf5 hwloc hypre matio metis mkl mumps netcdf petsc qd scalapack scotch sparse superlu taucs tbb test threads tvmet yaml zlib X " @@ -27,13 +27,14 @@ IUSE=" RESTRICT="test" RDEPEND=" + !dev-cpp/kokkos + dev-libs/boost:= sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) - boost? ( dev-libs/boost:= ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) @@ -108,8 +109,8 @@ src_configure() { -DTPL_ENABLE_AMD="$(usex sparse)" -DTPL_ENABLE_ARPREC="$(usex arprec)" -DTPL_ENABLE_BLACS="$(usex scalapack)" - -DTPL_ENABLE_BoostLib="$(usex boost)" - -DTPL_ENABLE_Boost="$(usex boost)" + -DTPL_ENABLE_BoostLib=ON + -DTPL_ENABLE_Boost=ON -DTPL_ENABLE_Clp="$(usex clp)" -DTPL_ENABLE_CSparse="$(usex sparse)" -DTPL_ENABLE_CUDA="$(usex cuda)" @@ -182,15 +183,14 @@ src_configure() { # export CC=mpicc CXX=mpicxx && tc-export CC CXX - # - # cmake-utils eclass patches the base directory CMakeLists.txt - # which does not work for complex Trilinos CMake modules - # - CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure + # Trilinos needs a custom build type: + local CMAKE_BUILD_TYPE=Release + + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install # Clean up the mess: mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" |