diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-19 00:02:33 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-19 00:02:33 +0000 |
| commit | 5d334c7470b5851fbacd4545c8ee0ea676a21ccc (patch) | |
| tree | 9fd6a98989a409178f5db098aaf2ffa8a646dd48 /testing/openmpi | |
| parent | 2f104ecf78d6a93ba8d67273b76364cb1365a6cf (diff) | |
Sat May 19 00:02:33 UTC 2012
Diffstat (limited to 'testing/openmpi')
| -rw-r--r-- | testing/openmpi/PKGBUILD | 12 | ||||
| -rw-r--r-- | testing/openmpi/openmpi-hostfile.patch | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD index 4aaac9a00..b34de46b4 100644 --- a/testing/openmpi/PKGBUILD +++ b/testing/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159081 2012-05-15 12:02:16Z stephane $ +# $Id: PKGBUILD 159205 2012-05-18 00:00:13Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" @@ -10,8 +10,10 @@ license=('custom') depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') makedepends=('inetutils') options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367') +source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2 + openmpi-hostfile.patch) +sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367' + 'a76da03418a106d57cfd020d0f8d887d7ec9225b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,7 +22,7 @@ build() { rm -r opal/libltdl # Search for openmpi-default-hostfile in /etc/openmpi - sed -i "s|%s/etc/openmpi-default-hostfile|/etc/openmpi/openmpi-default-hostfile|" orte/runtime/orte_mca_params.c + patch -Np1 -i ../openmpi-hostfile.patch ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ diff --git a/testing/openmpi/openmpi-hostfile.patch b/testing/openmpi/openmpi-hostfile.patch new file mode 100644 index 000000000..f6377674b --- /dev/null +++ b/testing/openmpi/openmpi-hostfile.patch @@ -0,0 +1,12 @@ +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); |