Date: Tuesday, May 15, 2012 @ 08:02:06 Author: stephane Revision: 159080
upgpkg: openmpi 1.6-1 Modified: openmpi/trunk/PKGBUILD Deleted: openmpi/trunk/openmpi-1.5.4-fix-fakeroot-execution.patch --------------------------------------------+ PKGBUILD | 16 ++++------ openmpi-1.5.4-fix-fakeroot-execution.patch | 43 --------------------------- 2 files changed, 7 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-05-15 11:54:56 UTC (rev 159079) +++ PKGBUILD 2012-05-15 12:02:06 UTC (rev 159080) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Stéphane Gaudreault <steph...@archlinux.org> pkgname=openmpi -pkgver=1.5.5 -pkgrel=3 +pkgver=1.6 +pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" @@ -10,20 +10,18 @@ depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') 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) +sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # 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 + sed -i "s|%s/etc/openmpi-default-hostfile|/etc/openmpi/openmpi-default-hostfile|" orte/runtime/orte_mca_params.c + ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ --mandir=/usr/share/man \ Deleted: openmpi-1.5.4-fix-fakeroot-execution.patch =================================================================== --- openmpi-1.5.4-fix-fakeroot-execution.patch 2012-05-15 11:54:56 UTC (rev 159079) +++ openmpi-1.5.4-fix-fakeroot-execution.patch 2012-05-15 12:02:06 UTC (rev 159080) @@ -1,43 +0,0 @@ -Description: If running under Debian fakeroot then its important - that this hook is disabled; a new stat check was introduced in - 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. -Author: James Page <james.p...@ubuntu.com> -Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 - -Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c -=================================================================== ---- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 -+++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 -@@ -738,15 +738,6 @@ - check_result_t r1, r2, lp, lpp; - bool want_rcache = false, found_driver = false; - -- /* First, check if ummunotify is present on the system. If it is, -- then we don't need to do the following ptmalloc2 hacks. -- open/mmap on the device may fail during init, but if /dev/ummunotify -- exists, we assume that the user/administrator *wants* to use -- ummunotify. */ -- if (stat("/dev/ummunotify", &st) == 0) { -- return; -- } -- - /* Yes, checking for an MPI MCA parameter here is an abstraction - violation. Cope. Yes, even checking for *any* MCA parameter - here (without going through the MCA param API) is an -@@ -769,6 +760,15 @@ - return; - } - -+ /* Next, check if ummunotify is present on the system. If it is, -+ then we don't need to do the following ptmalloc2 hacks. -+ open/mmap on the device may fail during init, but if /dev/ummunotify -+ exists, we assume that the user/administrator *wants* to use -+ ummunotify. */ -+ if (stat("/dev/ummunotify", &st) == 0) { -+ return; -+ } -+ - /* Look for sentinel files (directories) to see if various network - drivers are loaded (yes, I know, further abstraction - violations...). -