diff options
Diffstat (limited to 'extra/openmpi')
| -rw-r--r-- | extra/openmpi/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/openmpi/openmpi-hostfile.patch | 12 |
2 files changed, 4 insertions, 19 deletions
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 86e346cba..330cb5a14 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170075 2012-10-31 21:09:28Z stephane $ +# $Id: PKGBUILD 181255 2013-04-02 18:31:27Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi -pkgver=1.6.3 -pkgrel=1 +pkgver=1.6.4 +pkgrel=2 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" @@ -12,7 +12,7 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc') makedepends=('inetutils') options=(!libtool) source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a61aa2dee4c47d93d88e49ebed36de25df4f6492') +sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -57,9 +57,6 @@ package() { # Openmpi's otfinfo conflicts with the one from texlive mv "${pkgdir}"/usr/bin/otfinfo{,mpi} - # Openmpi's otfdump conflicts with the one from libotf - mv "${pkgdir}"/usr/bin/otfdump{,ompi} - # Remove dangling symlink rm "${pkgdir}"/usr/share/man/man1/orteCC.1 diff --git a/extra/openmpi/openmpi-hostfile.patch b/extra/openmpi/openmpi-hostfile.patch deleted file mode 100644 index f6377674b..000000000 --- a/extra/openmpi/openmpi-hostfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c ---- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile 2012-04-24 13:18:21.000000000 -0600 -+++ openmpi-1.6/orte/runtime/orte_mca_params.c 2012-05-15 16:35:24.769565442 -0600 -@@ -225,7 +225,7 @@ int orte_register_params(void) - false, false, 1000, &orte_timeout_usec_per_proc); - - /* default hostfile */ -- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix); -+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir); - mca_base_param_reg_string_name("orte", "default_hostfile", - "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)", - false, false, orte_default_hostfile, &orte_default_hostfile); |