diff --git a/common/shlibs b/common/shlibs index 56208a87a26..9258f464036 100644 --- a/common/shlibs +++ b/common/shlibs @@ -652,13 +652,13 @@ libapr-1.so.0 apr-1.4.2_1 libaprutil-1.so.0 apr-util-1.3.9_1 libnetpgp.so.0 libnetpgp-20100313_1 libmj.so.0 libmj-20140211_1 -libmca_common_sm.so.40 libopenmpi-3.0.0_1 -libmca_common_ompio.so.40 libopenmpi-3.0.0_1 -libmpi.so.40 libopenmpi-3.0.0_1 -libompitrace.so.40 libopenmpi-3.0.0_1 -libopen-pal.so.40 libopenmpi-3.0.0_1 -libopen-rte.so.40 libopenmpi-3.0.0_1 -liboshmem.so.40 libopenmpi-3.0.0_1 +libmca_common_sm.so.40 libopenmpi-3.0.1_1 +libmca_common_ompio.so.41 libopenmpi-3.0.1_1 +libmpi.so.40 libopenmpi-3.0.1_1 +libompitrace.so.40 libopenmpi-3.0.1_1 +libopen-pal.so.40 libopenmpi-3.0.1_1 +libopen-rte.so.40 libopenmpi-3.0.1_1 +liboshmem.so.40 libopenmpi-3.0.1_1 libmtp.so.9 libmtp-1.1.4_1 libelf.so.1 libelf-0.155_1 libdw.so.1 libelf-0.155_1 diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 6fb5b01e007..24abaab6230 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,6 +1,6 @@ # Template file for 'openmpi' pkgname=openmpi -version=3.0.0 +version=3.0.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -13,16 +13,17 @@ conf_files=" /etc/openmpi-totalview.tcl" short_desc="A High Performance Message Passing Library" homepage="https://www.open-mpi.org/" -license="3-clause-BSD" +license="BSD-3-Clause" maintainer="Juan RP " distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=f699bff21db0125d8cccfe79518b77641cd83628725a1e1ed3e45633496a82d7 +checksum=663450d1ee7838b03644507e8a76edfb1fba23e601e9e0b5b2a738e54acd785d nocross=yes # libtool -rpath /usr/lib issue post_extract() { sed -i 's,sys/unistd.h,unistd.h,g' opal/include/opal/sys/cma.h sed -i '1i#include ' opal/mca/pmix/pmix2x/pmix/include/pmix_server.h } + pre_configure() { # used wrongly upstream? but nocross anyway export CFLAGS="$CFLAGS $LDFLAGS" @@ -40,6 +41,7 @@ pre_configure() { unset FC FC_FOR_BUILD } + post_install() { vlicense LICENSE } @@ -52,11 +54,12 @@ libopenmpi_package() { } openmpi-devel_package() { - depends="libstdc++-devel zlib-devel lib${sourcepkg}>=${version}_${revision}" + depends="libopenmpi-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig vmove usr/share/man/man3 + vmove "usr/lib/*.so" } }