diff options
| -rw-r--r-- | mpich-3.2-r1.ebuild | 133 | ||||
| -rw-r--r-- | mpich-3.2.ebuild | 7 |
2 files changed, 4 insertions, 136 deletions
diff --git a/mpich-3.2-r1.ebuild b/mpich-3.2-r1.ebuild deleted file mode 100644 index 0dadfa5..0000000 --- a/mpich-3.2-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" - -inherit mpi-providers fortran-2 multilib-minimal - -MY_PV=${PV/_/} -DESCRIPTION="A high performance and portable MPI implementation" -HOMEPAGE="http://www.mpich.org/" -SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz" - -LICENSE="mpich" -KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+cxx doc fortran mpi-threads romio threads" - -COMMON_DEPEND=" - >=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}] - >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP}] - romio? ( net-fs/nfs-utils )" - -DEPEND="${COMMON_DEPEND} - dev-lang/perl - sys-devel/libtool" - -RDEPEND="${COMMON_DEPEND} - !sys-cluster/mpich2 - !sys-cluster/openmpi - !sys-cluster/nullmpi" - -S="${WORKDIR}"/${PN}-${MY_PV} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/mpicxx.h - /usr/include/mpi.h - /usr/include/opa_config.h -) - -src_prepare() { - default - - # Using MPICHLIB_LDFLAGS doesn't seem to fully work. - sed -i 's| *@WRAPPER_LDFLAGS@ *||' \ - src/packaging/pkgconfig/mpich.pc.in \ - src/env/*.in \ - || die -} - -multilib_src_configure() { - # The configure statements can be somewhat confusing, as they - # don't all show up in the top level configure, however, they - # are picked up in the children directories. Hence the separate - # local vars. - - local c= - if use mpi-threads; then - # MPI-THREAD requries threading. - c="${c} --with-thread-package=pthreads" - c="${c} --enable-threads=runtime" - else - if use threads ; then - c="${c} --with-thread-package=pthreads" - else - c="${c} --with-thread-package=none" - fi - c="${c} --enable-threads=single" - fi - - c="${c} --sysconfdir=${EPREFIX}/etc/${PN}" - c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}" - - export MPICHLIB_CFLAGS="${CFLAGS}" - export MPICHLIB_CPPFLAGS="${CPPFLAGS}" - export MPICHLIB_CXXFLAGS="${CXXFLAGS}" - export MPICHLIB_FFLAGS="${FFLAGS}" - export MPICHLIB_FCFLAGS="${FCFLAGS}" - export MPICHLIB_LDFLAGS="${LDFLAGS}" - unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS - - ECONF_SOURCE=${S} econf \ - --enable-shared \ - --with-hwloc-prefix="${EPREFIX}/usr" \ - ${c} \ - --with-pm=hydra \ - --disable-fast \ - --enable-versioning \ - $(use_enable romio) \ - $(use_enable cxx) \ - $(multilib_native_use_enable fortran fortran all) -} - -multilib_src_test() { - emake -j1 check -} - -multilib_src_install() { - default - - # fortran header cannot be wrapped (bug #540508), workaround part 1 - if use fortran; then - if multilib_is_native_abi; then - mkdir "${T}"/fortran || die - mv "${ED}"usr/include/mpif* "${T}"/fortran || die - mv "${ED}"usr/include/*.mod "${T}"/fortran || die - else - rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die - fi - fi - - mpi-provider_safe_mv $EPREFIX -} - -multilib_src_install_all() { - # fortran header cannot be wrapped (bug #540508), workaround part 2 - if use fortran; then - mv "${T}"/fortran/* "${ED}"usr/include || die - fi - - einstalldocs - newdoc src/pm/hydra/README README.hydra - if use romio; then - newdoc src/mpi/romio/README README.romio - fi - - if ! use doc; then - rm -rf "${ED}"usr/share/doc/${PF}/www* || die - fi - - mpi-provider_safe_mv || die -} diff --git a/mpich-3.2.ebuild b/mpich-3.2.ebuild index 8b8557c..6f2574d 100644 --- a/mpich-3.2.ebuild +++ b/mpich-3.2.ebuild @@ -5,7 +5,7 @@ EAPI=5 FORTRAN_NEEDED=fortran -inherit mpi-providers fortran-2 +inherit fortran-2 mpi-providers MY_PV=${PV/_/} DESCRIPTION="A high performance and portable MPI implementation" @@ -82,10 +82,11 @@ src_configure() { unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS econf ${c} \ + --sysconfdir="$(mpi-providers_sysconfdir)" \ --with-pm=hydra \ --disable-fast \ --enable-versioning \ - ${hydra_c} + ${hydra_c} $(use_enable romio) \ $(use_enable cxx) \ $(use_enable fortran f77) \ @@ -109,5 +110,5 @@ src_install() { if ! use doc; then rm -rf "${D}"usr/share/doc/${PF}/www* fi - mpi-providers_safe_mv || die "failed to mv" + mpi-providers_safe_mv } |