[arch-commits] Commit in openmpi/trunk (PKGBUILD openmpi-hostfile.patch)

[Stéphane Gaudreault]

    Date: Wednesday, August 22, 2012 @ 18:11:05
  Author: stephane
Revision: 165528

upgpkg: openmpi 1.6.1-1

upstream update

Modified:
  openmpi/trunk/PKGBUILD
Deleted:
  openmpi/trunk/openmpi-hostfile.patch

------------------------+
 PKGBUILD               |   13 ++++---------
 openmpi-hostfile.patch |   12 ------------
 2 files changed, 4 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-22 22:01:24 UTC (rev 165527)
+++ PKGBUILD	2012-08-22 22:11:05 UTC (rev 165528)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
 pkgname=openmpi
-pkgver=1.6
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64')
 url="http://www.open-mpi.org"
@@ -10,10 +10,8 @@
 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
-        openmpi-hostfile.patch)
-sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367'
-          'a76da03418a106d57cfd020d0f8d887d7ec9225b')
+source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1ccff71e3775c80c5a553f30104d663e1226baab')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,9 +19,6 @@
    # Make sure we use the system ltdl librariry rather than the ones in the tarball
    rm -r opal/libltdl
 
-   # Search for openmpi-default-hostfile in /etc/openmpi
-   patch -Np1 -i ../openmpi-hostfile.patch
-
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --mandir=/usr/share/man \

Deleted: openmpi-hostfile.patch
===================================================================
--- openmpi-hostfile.patch	2012-08-22 22:01:24 UTC (rev 165527)
+++ openmpi-hostfile.patch	2012-08-22 22:11:05 UTC (rev 165528)
@@ -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);