diff options
| author |   Michael Gilroy <michael.gilroy24@gmail.com> | 2017-07-20 07:33:51 -0600 |
|---|---|---|
| committer | Michael Gilroy <michael.gilroy24@gmail.com> | 2017-07-20 07:33:51 -0600 |
| commit | 91ee9e34b488784cdcb33255ddcf853d54186cd3 (patch) | |
| tree | 573032207096ee6a6a48a13b1ca2b8da5fb83470 | |
| parent | added LDFLAGS to src_configure (diff) | |
| download | gentoo-mpi-91ee9e34b488784cdcb33255ddcf853d54186cd3.tar.gz gentoo-mpi-91ee9e34b488784cdcb33255ddcf853d54186cd3.tar.bz2 gentoo-mpi-91ee9e34b488784cdcb33255ddcf853d54186cd3.zip | |
changed LDFLAGS modififcations to LD_LIBRARY_PATH export
| -rw-r--r-- | eclass/mpi-providers.eclass | 2 | ||||
| -rw-r--r-- | eclass/mpi-select.eclass | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/eclass/mpi-providers.eclass b/eclass/mpi-providers.eclass index 039b75d..ec80400 100644 --- a/eclass/mpi-providers.eclass +++ b/eclass/mpi-providers.eclass @@ -36,7 +36,7 @@ mpi-providers_safe_mv() { local i for i in ${D}/etc/*; do - [ "${i}" == "${D}/etc/${PN}-${PVR}" ] && continue + [ "${i}" != "${D}/etc/${PN}-${PVR}" ] && continue mv ${i} ${D}/etc/${PN}-${PVR} || die done } diff --git a/eclass/mpi-select.eclass b/eclass/mpi-select.eclass index 6eab65e..c82a4e5 100644 --- a/eclass/mpi-select.eclass +++ b/eclass/mpi-select.eclass @@ -134,9 +134,8 @@ mpi_wrapper() { export BUILD_DIR="${PF}-${ABI}" - # add lflags - export LFLAGS="/usr/lib/mpi/$(get_implementation)/usr/bin" - + export LD_LIBRARY_PATH="/usr/$(get_libdir)/mpi/mpich-3.2/install/usr/bin:${LD_LIBRARY_PATH}" + echo ${impl} } @@ -162,7 +161,7 @@ mpi-select_bindir() # Helper function for getting the directory for libraries to be installed to mpi-select_libdir() { - echo "${D}/usr/$(get_libdir)/${PF}/" + echo "${D}/usr/$(get_libdir)/mpi/${PF}/" } # @ECLASS-FUNCTION: mpi-select_etcdir @@ -189,14 +188,14 @@ mpi-select_src_configure() { append-cflags -std=gnu89 + mpi_wrapper + if [[ "${imp}" == "mpich" ]]; then einfo "hit mpich" elif [[ "${imp}" == "openmpi" ]]; then einfo "hit openmpi" fi - export LDFLAGS="/usr/lib/mpi/$(get_implementation)/usr/bin:LDFLAGS" - mpi-select_src_configure() { mkdir -p "${BUILD_DIR}" || die |