diff options
| -rw-r--r-- | eclass/mpi-select-r1.eclass | 10 | ||||
| -rw-r--r-- | eclass/mpi-select.eclass | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/eclass/mpi-select-r1.eclass b/eclass/mpi-select-r1.eclass index 12e7105..5a7eb13 100644 --- a/eclass/mpi-select-r1.eclass +++ b/eclass/mpi-select-r1.eclass @@ -34,6 +34,12 @@ INSTALLED_IMPLEMENTATIONS=get_all_implementations # Location in which mpi software should be installed MPI_DIR="/usr/$(get_libdir)/mpi" +# @ECLASS-VARIABLE: MPI_TARGETS +# @INTERNAL +# @DESCRIPTION: +# List of implementations in make.conf. +MPI_TARGETS="${MPI_TARGETS}" + # @ECLASS-FUNCTION: mpi-select_detect_installs # @DESCRIPTION: # See what MPI software is installed on the system @@ -94,8 +100,6 @@ mpi_wrapper() { export BUILD_DIR="${PF}-${ABI}" - impl="$(grep -R MPI_TARGETS* /etc/portage/make.conf* | cut -d '\"' -f2)" - echo ${impl} } @@ -155,7 +159,7 @@ mpi_src_install() local i for i in "${D}/etc/"*; do [ "${i}" == $(mpi-select_etcdir) ] && continue - mv "${i}" $(mpi-select_etcdir) + mv "${i}" $(mpi-select_etcdir) || die "failed to mv" done find . -type d -empty -delete || die "could not delete empty directories" diff --git a/eclass/mpi-select.eclass b/eclass/mpi-select.eclass index 0584542..87a6054 100644 --- a/eclass/mpi-select.eclass +++ b/eclass/mpi-select.eclass @@ -34,6 +34,12 @@ INSTALLED_IMPLEMENTATIONS=get_all_implementations # Location in which mpi software should be installed MPI_DIR="/usr/$(get_libdir)/mpi" +# @ECLASS-VARIABLE: MPI_TARGETS +# @INTERNAL +# @DESCRIPTION: +# List of implementations in make.conf. +MPI_TARGETS="${MPI_TARGETS}" + # @ECLASS-FUNCTION: mpi-select_detect_installs # @DESCRIPTION: # See what MPI software is installed on the system @@ -94,7 +100,6 @@ mpi_wrapper() { export BUILD_DIR="${PF}-${ABI}" - impl="$(grep -R MPI_TARGETS* /etc/portage/make.conf* | cut -d '\"' -f2)" echo ${impl} } |