diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-02 00:01:22 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-02 00:01:22 +0000 |
| commit | defe74c9cba07c321ad2869d8f6872e64a167324 (patch) | |
| tree | 22377a98049a863983b9a28d9d79fc737f665cc3 /testing/openmpi | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Wed May 2 00:01:22 UTC 2012
Diffstat (limited to 'testing/openmpi')
| -rw-r--r-- | testing/openmpi/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD index 4b462b7b7..78bf33ab0 100644 --- a/testing/openmpi/PKGBUILD +++ b/testing/openmpi/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 154489 2012-03-29 09:52:47Z stephane $ +# $Id: PKGBUILD 157996 2012-04-30 21:40:03Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.5 -pkgrel=1 +pkgrel=3 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" license=('custom') -depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') +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 @@ -20,6 +20,9 @@ build() { # 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 ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ @@ -34,7 +37,7 @@ build() { --enable-pretty-print-stacktrace \ --without-slurm \ --with-hwloc=/usr \ - --with-libltdl=/usr \ + --with-libltdl=/usr \ FC=/usr/bin/gfortran \ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" @@ -48,7 +51,7 @@ package() { # FS#28583 install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do - ln -sf /usr/lib/openmpi/pkgconfig/$i "${pkgdir}"/usr/lib/pkgconfig/ + ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/ done # Openmpi's otfinfo conflicts with the one from texlive |