Date: Thursday, May 17, 2012 @ 20:00:03 Author: stephane Revision: 159204
upgpkg: openmpi 1.6-2 switch to a better fix for the default hostfile location Added: openmpi/trunk/openmpi-hostfile.patch Modified: openmpi/trunk/PKGBUILD ------------------------+ PKGBUILD | 10 ++++++---- openmpi-hostfile.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-05-17 23:20:15 UTC (rev 159203) +++ PKGBUILD 2012-05-18 00:00:03 UTC (rev 159204) @@ -2,7 +2,7 @@ # Maintainer: Stéphane Gaudreault <[email protected]> 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 @@ 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 @@ 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} \ Added: openmpi-hostfile.patch =================================================================== --- openmpi-hostfile.patch (rev 0) +++ openmpi-hostfile.patch 2012-05-18 00:00:03 UTC (rev 159204) @@ -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);
