diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
| commit | 2906c522e750f7e013d7af606f01ad849a7d3876 (patch) | |
| tree | d62491c93d6534817db7f9b7d07adf64b9670b48 /extra/openmpi | |
| parent | 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff) | |
| parent | bd614ac21d2754d778a796cd5e92d1568ec8baec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mesa/PKGBUILD
extra/nmap/PKGBUILD
extra/openmpi/PKGBUILD
extra/rasqal/PKGBUILD
extra/sqlite/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-hooks-udev
testing/udev/initcpio-install-udev
Diffstat (limited to 'extra/openmpi')
| -rw-r--r-- | extra/openmpi/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/openmpi/openmpi-hostfile.patch | 12 |
2 files changed, 22 insertions, 11 deletions
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index e980fed3f..b8de218c1 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158183 2012-05-03 13:22:34Z stephane $ +# $Id: PKGBUILD 159287 2012-05-20 22:11:21Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi -pkgver=1.5.5 -pkgrel=3 +pkgver=1.6 +pkgrel=2 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" @@ -11,10 +11,10 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc') [ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2 - openmpi-1.5.4-fix-fakeroot-execution.patch) -sha1sums=('206e555f6d376443f2342f721d944e67dd1a04ef' - 'ec46abb6f9e01daca910e4079b9abc036db9ed20') +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}" @@ -24,13 +24,12 @@ build() { else valgrind="--with-valgrind" fi - - # Fix fakeroot problem (FS#28644) - patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch - # 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 \ diff --git a/extra/openmpi/openmpi-hostfile.patch b/extra/openmpi/openmpi-hostfile.patch new file mode 100644 index 000000000..f6377674b --- /dev/null +++ b/extra/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); |