diff options
| -rw-r--r-- | eclass/mpi-select.eclass | 30 | ||||
| -rw-r--r-- | sys-cluster/hpl/Manifest | 2 | ||||
| -rw-r--r-- | sys-cluster/hpl/hpl-2.1.ebuild | 4 |
3 files changed, 26 insertions, 10 deletions
diff --git a/eclass/mpi-select.eclass b/eclass/mpi-select.eclass index c82a4e5..dbd0642 100644 --- a/eclass/mpi-select.eclass +++ b/eclass/mpi-select.eclass @@ -40,24 +40,40 @@ MPI_DIR="/usr/$(get_libdir)/mpi" # List of implementations in make.conf. MPI_TARGETS="${MPI_TARGETS}" +# @FUNCTION: mpi_dependencies +# List of dependcies needed for mpi software +mpi_dependencies() +{ + # similar to mpi_pkg_deplist + echo "hit" +} + +# @FUNCTION: get_mpicc +# @DESCRIPTION: +# Fetches most recent version of mpicc installed +get_mpicc() +{ + echo "$(ls -dv /usr/$(get_libdir)/mpi/mpich-* | tail -n 1)" || die "could not get mpicc" +} + # @FUNCTION : mpi_pkg_cc # @DESCRIPTION : # Get location of C compiler from /usr/ mpi_pkg_cc() { - mpi_pkg_compiler "MPI_CC" "cc" + mpi_pkg_compiler "cc" } # @FUNCTION: mpi_pkg_compiler # @DESCRIPTION : -# Return /usr/bin/mpi/$PN +# Returns correct path for the compiler mpi_pkg_compiler { - local suffixes="${2}" - - for p in ${suffixes}; do - if [ -x ${ROOT}usr/bin/mpi${PN} ]; then - echo "${ROOT}usr/bin/mpi${PN}" + local args + for args in "${1}"; do + if [ -f "/usr/lib64/mpi/mpich-3.2/install/usr/bin" ]; then + die "hit!!" + echo "$(get_mpicc)/install/usr/bin/mpi${args}" break fi done diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest index b4a04ae..cc8d24b 100644 --- a/sys-cluster/hpl/Manifest +++ b/sys-cluster/hpl/Manifest @@ -1,3 +1,3 @@ DIST hpl-2.1.tar.gz 527433 SHA256 dd437dd34a098c51092319983addff1d8076fc8dd692d19c488252477363af15 SHA512 ed39e407341d1cfe2d4d7e50f029e3ca62c7e87e82c3b09a89fd231c5cb4f1c95857f050a940bfd60b724eaa9fdab8631a0693a14b6e9dac82c05897bff557a4 WHIRLPOOL 7e0ff3132590869cff9366c3e34d1abcbfc2be6fceccd336785ce680412981bde658fb67a3663235e15b432c7e0b7e95b79296029d051dbccec239c0c960ae20 -EBUILD hpl-2.1.ebuild 1972 SHA256 ab47061bf1a907dc67e9c0770d3d863fe02616c05d98811e689cc9f221c1aed8 SHA512 6ec23e35ebd218767ddb6feb8e5cd8ef510ea41bb4ad3727b6d828528a0777870a6dc91b0f4076aef6c2575a6904cdd1106504cf92279f6589c3749baf692aef WHIRLPOOL 6bf6f1a668d4e04255e4448d839d2f12363e7643652775f9f99244fddbb2e45bea75aa774f7bbe6e3fe27db4e73f6c94623ed645422fd6a5c108b20dae7e23fc +EBUILD hpl-2.1.ebuild 1966 SHA256 623c9448d893dadbfc00319e9e05be996c51a37faca24f910409784157e6ba7c SHA512 4dea42fbf09f1066506ab278e9327eacb9bb49b2bb2c198575f4db6c98b6d314b951746dec21034fbd340e8f322b81bb5af89bcb7b1b486126b5ca80aae85dfe WHIRLPOOL 9af4d4ea320bc12a0bcec2b1110683386664223ef644b1ce212dbc08cbac1a2584e87868d3cb600a063c701c583f9150f170b7fb7343fe9407a04ba6ea7ef801 MISC metadata.xml 263 SHA256 0c67f68407c1153b709d094f4f7de7710f178662bb5912f1f025dbe2a842ed10 SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5 WHIRLPOOL 5951a5587420612364b1c9f51ae31a3aed0ca3ea83a26f8d6fd2a2860a6a5a46b2ad8ca0260b591ec88f7fde17ab78213acac7aeced15398992cbd2de579c82f diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild index 59faaa0..1aac1dd 100644 --- a/sys-cluster/hpl/hpl-2.1.ebuild +++ b/sys-cluster/hpl/hpl-2.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils mpi multilib mpi-select +inherit eutils multilib mpi-select DESCRIPTION="High-Performance Linpack Benchmark for Distributed-Memory Computers" HOMEPAGE="http://www.netlib.org/benchmark/hpl/" @@ -22,7 +22,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - local mpicc_path="$(mpi_pkg_cc)" + local mpicc_path=$(mpi_pkg_cc) local a="" local locallib="${EPREFIX}/usr/$(get_libdir)/lib" |