Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 442882 Details for
Bug 519700
sys-cluster/{openmpi,mpich2}: migrate to multilib eclasses
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to add multilib support to openmpi
openmpi-1.8.4-r4.ebuild.patch (text/plain), 5.38 KB, created by
Christoph Junghans (RETIRED)
on 2016-08-09 22:53:42 UTC
(
hide
)
Description:
patch to add multilib support to openmpi
Filename:
MIME Type:
Creator:
Christoph Junghans (RETIRED)
Created:
2016-08-09 22:53:42 UTC
Size:
5.38 KB
patch
obsolete
>--- openmpi-1.8.4-r4.ebuild 2016-06-30 10:30:20.794619000 -0600 >+++ openmpi-1.8.4-r99.ebuild 2016-08-09 16:50:48.042413136 -0600 >@@ -6,7 +6,7 @@ > > FORTRAN_NEEDED=fortran > >-inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator >+inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator multilib-minimal > > MY_P=${P/-mpi} > S=${WORKDIR}/${MY_P} >@@ -34,7 +34,7 @@ > SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2" > LICENSE="BSD" > SLOT="0" >-KEYWORDS="alpha ~amd64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" >+KEYWORDS="" > IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads numa romio threads vt > ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" > >@@ -54,26 +54,31 @@ > !app-text/lcdf-typetools > )" > >+# dev-util/nvidia-cuda-toolkit is always multilib > RDEPEND=" > !sys-cluster/mpich > !sys-cluster/mpich2 > !sys-cluster/mpiexec >- dev-libs/libevent >- dev-libs/libltdl:0 >- >=sys-apps/hwloc-1.9.1[numa?] >- sys-libs/zlib >- cuda? ( dev-util/nvidia-cuda-toolkit ) >+ >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] >+ dev-libs/libltdl:0[${MULTILIB_USEDEP}] >+ >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?] >+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >+ cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) > elibc_FreeBSD? ( dev-libs/libexecinfo ) >- openmpi_fabrics_ofed? ( sys-fabric/ofed ) >+ openmpi_fabrics_ofed? ( sys-infiniband/ofed:* ) > openmpi_fabrics_knem? ( sys-cluster/knem ) > openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) >- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) >+ openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm:* ) > openmpi_rm_pbs? ( sys-cluster/torque ) > openmpi_rm_slurm? ( sys-cluster/slurm ) >- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >+ openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm:* ) > " > DEPEND="${RDEPEND}" > >+MULTILIB_WRAPPED_HEADERS=( >+ /usr/include/mpi.h >+) >+ > pkg_setup() { > fortran-2_pkg_setup > >@@ -106,7 +111,7 @@ > AT_M4DIR=config eautoreconf > } > >-src_configure() { >+multilib_src_configure() { > local myconf=( > --sysconfdir="${EPREFIX}/etc/${PN}" > --enable-pretty-print-stacktrace >@@ -128,43 +133,59 @@ > > ! use vt && myconf+=(--enable-contrib-no-build=vt) > >- econf "${myconf[@]}" \ >+ ECONF_SOURCE=${S} econf "${myconf[@]}" \ > $(use_enable cxx mpi-cxx) \ > $(use_with cma) \ > $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \ > $(use_enable romio io-romio) \ > $(use_enable heterogeneous) \ > $(use_enable ipv6) \ >- $(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \ >- $(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \ >- $(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \ >- $(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \ >- $(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \ >- $(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \ >- $(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \ >- $(use_enable openmpi_ofed_features_udcm openib-udcm) \ >- $(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \ >- $(use_enable openmpi_ofed_features_failover btl-openib-failover) \ >- $(use_with openmpi_rm_pbs tm) \ >- $(use_with openmpi_rm_slurm slurm) >+ $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \ >+ $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \ >+ $(multilib_native_use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \ >+ $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \ >+ $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \ >+ $(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \ >+ $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \ >+ $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \ >+ $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \ >+ $(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \ >+ $(multilib_native_use_with openmpi_rm_pbs tm) \ >+ $(multilib_native_use_with openmpi_rm_slurm slurm) > } > >-src_install () { >- emake DESTDIR="${D}" install >+multilib_src_install() { >+ default >+ >+ # Remove la files, no static libs are installed and we have pkg-config >+ find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete >+ >+ # fortran header cannot be wrapped (bug #540508), workaround part 1 >+ if multilib_is_native_abi && use fortran; then >+ mkdir "${T}"/fortran || die >+ mv "${ED}"/usr/include/mpif* "${T}"/fortran || die >+ else >+ #some fortran files get installed unconditionally >+ rm "${ED}"/usr/include/mpif* "${ED}"/usr/bin/mpif* || die >+ fi >+} > >+multilib_src_install_all() { > # From USE=vt see #359917 > rm "${ED}"/usr/share/libtool &> /dev/null > >+ # fortran header cannot be wrapped (bug #540508), workaround part 2 >+ if use fortran; then >+ mv "${T}"/fortran/mpif* "${ED}"/usr/include || die >+ fi >+ > # Avoid collisions with libevent > rm -rf "${ED}"/usr/include/event2 &> /dev/null > >- # Remove la files, no static libs are installed and we have pkg-config >- find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete >- >- dodoc README AUTHORS NEWS VERSION || die >+ dodoc README AUTHORS NEWS VERSION > } > >-src_test() { >+multilib_src_test() { > # Doesn't work with the default src_test as the dry run (-n) fails. > emake -j1 check > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 519700
: 442882 |
442884