diff options
| author |   Michael Gilroy <michael.gilroy24@gmail.com> | 2017-07-25 00:19:03 -0600 |
|---|---|---|
| committer | Michael Gilroy <michael.gilroy24@gmail.com> | 2017-07-25 00:19:03 -0600 |
| commit | 23c1e55912df269c53aa17c5308d490ac092c717 (patch) | |
| tree | 6e49550e0536a0846ea1d1d648212a88f0045e1d | |
| parent | added src_* functions to hpl to test (diff) | |
| download | gentoo-mpi-23c1e55912df269c53aa17c5308d490ac092c717.tar.gz gentoo-mpi-23c1e55912df269c53aa17c5308d490ac092c717.tar.bz2 gentoo-mpi-23c1e55912df269c53aa17c5308d490ac092c717.zip | |
different variations of functions in mpi-select due to build failures
| -rw-r--r-- | eclass/mpi-select.eclass | 23 | ||||
| -rw-r--r-- | sys-cluster/hpl/Manifest | 2 | ||||
| -rw-r--r-- | sys-cluster/hpl/hpl-2.1.ebuild | 7 |
3 files changed, 17 insertions, 15 deletions
diff --git a/eclass/mpi-select.eclass b/eclass/mpi-select.eclass index 8c61032..918fe71 100644 --- a/eclass/mpi-select.eclass +++ b/eclass/mpi-select.eclass @@ -84,6 +84,14 @@ mpi_pkg_compiler done } +# @FUNCTION: mpi_root +# @DESCRIPTION: +# Sets the root directory for the mpi pkg install +mpi_root +{ + echo "/usr/$(get_libdir)/mpi/${PF}" +} + # @FUNCTION: _mpi_do # @DESCRIPTION: # mpi-sepecific build functions to be called from mpi pkg ebuilds @@ -187,13 +195,6 @@ mpi_dohard() { _mpi_do "dohard" $*; } mpi_doins() { _mpi_do "doins" $*; } mpi_dosym() { _mpi_do "dosym" $*; } -# @FUNCTION: mpi_root -# @DESCRIPTION: -# Sets the root directory for the mpi pkg install -mpi_root -{ - echo "/usr/$(get_libdir)/mpi/${PF}" -} # @ECLASS-FUNCTION: mpi-select_detect_installs # @DESCRIPTION: @@ -276,10 +277,10 @@ mpi-select_get_implementation() echo "${PN}" } -# @FUCNTION: mpi_pkg_set_env +# @FUCNTION: mpi-select_mpi_pkg_set_env # @DESCRIPTION: # Set environment variables specificly for mpi -mpi_pkg_set_env() +mpi-select_mpi_pkg_set_env() { _mpi_oCC=${CC} _mpi_oCXX=${CXX} @@ -295,10 +296,10 @@ mpi_pkg_set_env() export LD_LIBRARY_PATH="/usr/$(get_libdir)/mpi/mpich-3.2/install/usr/bin:${LD_LIBRARY_PATH}" } -# @FUCNTION: mpi_pkg_restore_env +# @FUCNTION: mpi-select_mpi_pkg_restore_env # @DESCRIPTION: # Set envrionment variables to what they were before mpi_pkg_set_env -mpi_pkg_set_env() +mpi-select_mpi_pkg_set_env() { export CC=${_mpi_oCC} export CXX=$_mpi_oCXX diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest index eec23a9..78e03f9 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 2002 SHA256 1593025ab0740dba5370726ba4e39b66b543be236c6c8c7947e6ce6ee7c1d8e0 SHA512 86423a6b0d6f3047832c7a829539f94cdfb4543cd79c0a67b1b30af537efbf475550217a1f62312e95d2e21252e7d7f2e7b85648f1fb9ca9d64936fd6bc2377d WHIRLPOOL 938f4986e69198bfbe6b34b92a167441a6f2b23930990a9161652d970edbf120c205e94aa63f22d51bd8be52b3b8ecf1a3faf4d35b2d55c67b07755a0f508ab6 +EBUILD hpl-2.1.ebuild 2099 SHA256 4c3f1a6569836f8ba01687f7a257c608795942566bae95074cbbefc58a5762bc SHA512 d0d3e7877e5809a0d6134cc3a719d2b2fc837cfc1205eb0f6229d005867d89195e0fbe31008996b061bd7e4d678da34acb313d95f50cce6fc804ae9b26ef1bf4 WHIRLPOOL 85f00d15e56fd0beb6f5e049ba63a48aa3ad3fe56e455b39ac35c28a6ce339ad286117f97abf9e2062d8359773614bb63b9b5a408674f63be8e9c16c2c21feda 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 23fa116..8f7ca6e 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 multilib mpi-select +inherit eutils mpi-select multilib DESCRIPTION="High-Performance Linpack Benchmark for Distributed-Memory Computers" HOMEPAGE="http://www.netlib.org/benchmark/hpl/" @@ -60,13 +60,14 @@ src_install() { if use doc; then mpi_dohtml -r www/* fi - insinto $(mpi_root)usr/share/hpl + mpiroot=mpi_root + insinto "${mpiroot}usr/share/hpl" mpi-select_src_install mpi_doins bin/gentoo_hpl_fblas_x86/HPL.dat } pkg_postinst() { - local d=$(mpi_root) + local d=mpi_root einfo "Remember to copy $(mpi_root)usr/share/hpl/HPL.dat to your working directory" einfo "before running xhpl. Typically one may run hpl by executing:" einfo "\"mpiexec -np 4 /usr/bin/xhpl\"" |