diff options
Diffstat (limited to 'sci-libs/hypre')
| -rw-r--r-- | sci-libs/hypre/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/hypre/hypre-2.21.0.ebuild (renamed from sci-libs/hypre/hypre-2.18.2-r1.ebuild) | 39 |
2 files changed, 27 insertions, 16 deletions
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest index a160a2d8626e..e6252bb9c74a 100644 --- a/sci-libs/hypre/Manifest +++ b/sci-libs/hypre/Manifest @@ -1,5 +1,5 @@ -DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4 DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350 -EBUILD hypre-2.18.2-r1.ebuild 2752 BLAKE2B 6998f04eecaa6fcf81e817a63b0f99423893fb2378e67de52ab860a37bc932d5be3391a9a753920eb3b3c597496afe0b6080dec95ede32f3fe8c012267d190fe SHA512 85b026a7842e7baa0371aba406f1f0412c36234ef3c9eea8f69d8370c2d04f256631b4b2387ed4369d5ad139cfe6e21f4398b28f9f55e46bed51eccbcd8731a6 +DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dccfe2101ceed555cb7cbef77989b6af2c80f9b08e8efd6e2401269415532614d40512f93371397389e0fb15595 SHA512 20f860b0c25190608b50d577e03ab241d8caa1dbf7a7e56484e984710a586b1f4b63c72135488a756f42aa6a58d0a26b0c4e6e1680c3f7faabdf68e2559293b0 EBUILD hypre-2.20.0.ebuild 2786 BLAKE2B e83539542a2b250cc17700f72a3835978d33e5b9681100c219b23eb45cb65a7e0c5ec704dca793bf75dabc6e68b24604079c57655ffb16c444c693ceb633e241 SHA512 b214006890a03be04184e0c4bbfebd2480fd2d9e586bc6735a1b6af430bba808fedd31f9f98002ae69f0d7ba47f67c3aee264e37e6595f30ec96f7bb8c3a1eab +EBUILD hypre-2.21.0.ebuild 2772 BLAKE2B 02f3bef55c9fddfee73b06f753d659c428ecc9e79d27667eae0b7c92822b168d1a32aa49ffc1de8d46636adbeaed17c63512e05349e36fb7a560b0dc5c54aebd SHA512 f89b1fe7d8055ab71a44b74ece9d873e3572d17887baad401a97c3e4e292e1be738f20ca64b7f92885ccad6ddaa127715ef1e6208c0c852b03f00b816d12e475 MISC metadata.xml 615 BLAKE2B 8bd8c87a70e3203b79255f63bf25671cbaed470d177d2dca5ba77348fcf3430482f80b06d2f48beaa24eb49664aaaf2b93410d7240f402313694031362bcf899 SHA512 51002ae26a7957688265381df0619348726b6f6a39a036421e8574dc56382b21c1b642f3f0592f8eb02b1435979adcc0936fe734f1a01080093a0802af30d205 diff --git a/sci-libs/hypre/hypre-2.18.2-r1.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild index e47dfb45334e..ba8ee592057c 100644 --- a/sci-libs/hypre/hypre-2.18.2-r1.ebuild +++ b/sci-libs/hypre/hypre-2.21.0.ebuild @@ -9,11 +9,11 @@ inherit fortran-2 toolchain-funcs flag-o-matic DESCRIPTION="Parallel matrix preconditioners library" HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods" -SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug examples fortran int64 openmp mpi" BDEPEND="virtual/pkgconfig" @@ -21,19 +21,20 @@ RDEPEND=" sci-libs/superlu:= virtual/blas virtual/lapack - mpi? ( virtual/mpi )" + mpi? ( virtual/mpi ) +" DEPEND="${RDEPEND}" DOCS=( CHANGELOG COPYRIGHT README ) pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] &&\ - use openmp && [[ $(tc-getCC) == *gcc* ]] && tc-check-openmp + if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then + tc-check-openmp + fi } pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && \ - use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then + if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then ewarn "You are using a non capable gcc compiler ( < 4.2 ? )" die "Need an OpenMP capable compiler" fi @@ -41,12 +42,15 @@ pkg_setup() { src_prepare() { default + # link with system superlu and propagate LDFLAGS sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \ -e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \ -i src/config/Makefile.config.in || die + sed -e '/HYPRE_ARCH/s: = :=:g' \ -i src/configure || die + # link with system blas and lapack sed -e '/^BLASFILES/d' \ -e '/^LAPACKFILES/d' \ @@ -56,9 +60,16 @@ src_prepare() { src_configure() { tc-export CC CXX append-flags -Dhypre_dgesvd=dgesvd_ - use openmp && [[ $(tc-getCC) == *gcc* ]] && \ + + if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then append-flags -fopenmp && append-ldflags -fopenmp - use mpi && CC=mpicc FC=mpif77 CXX=mpicxx + fi + + if use mpi ; then + CC=mpicc + FC=mpif77 + CXX=mpicxx + fi cd src || die @@ -85,15 +96,15 @@ src_compile() { src_test() { LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \ - PATH="${S}/src/test:${PATH}" \ - emake -C src check + PATH="${S}/src/test:${PATH}" \ + emake -C src check } src_install() { emake -C src install \ - HYPRE_INSTALL_DIR="${ED}" \ - HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \ - HYPRE_INC_INSTALL="${ED}/usr/include/hypre" + HYPRE_INSTALL_DIR="${ED}" \ + HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \ + HYPRE_INC_INSTALL="${ED}/usr/include/hypre" if use examples; then dodoc -r src/examples |