diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-02 18:53:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-02 18:53:10 +0100 |
| commit | 588ef662386ce30b28688e95f11f7fc7a52f8e25 (patch) | |
| tree | a62b104d7b70d82767fbde6aeb782b1359302459 /extra/openmpi/PKGBUILD | |
| parent | 9ea487ed90ebf891571ea8fffd34c154cbf981df (diff) | |
| parent | b479098a1b8d7cb545339cb225a7cde4988b2748 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/kdesvn/PKGBUILD
community/lwm/PKGBUILD
community/sakura/PKGBUILD
extra/openmpi/PKGBUILD
extra/qt/PKGBUILD
Diffstat (limited to 'extra/openmpi/PKGBUILD')
| -rw-r--r-- | extra/openmpi/PKGBUILD | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index aeaa6d084..229843e81 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,43 +1,33 @@ -# $Id: PKGBUILD 150800 2012-02-22 17:25:13Z stephane $ +# $Id: PKGBUILD 151701 2012-03-01 00:42:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.4 -pkgrel=4 +pkgrel=5 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" license=('custom') -depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') -[ "$CARCH" = "mips64el" ] && \ -depends=('gcc-fortran' 'openssh' 'libtool' 'hwloc') +depends=('gcc' 'gcc-fortran' 'openssh' 'libtool' 'hwloc') +[ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c') +source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2 + openmpi-1.5.4-fix-fakeroot-execution.patch) +sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c' + 'ec46abb6f9e01daca910e4079b9abc036db9ed20') build() { cd "${srcdir}/${pkgname}-${pkgver}" -# Disable valgrind if [ "$CARCH" = "mips64el" ]; then - ./configure --prefix=/usr \ - --sysconfdir=/etc/${pkgname} \ - --mandir=/usr/share/man \ - --enable-mpi-f90 \ - --libdir=/usr/lib/${pkgname} \ - --with-threads=posix \ - --enable-mpi-threads \ - --enable-smp-locks \ - --without-valgrind \ - --enable-memchecker \ - --enable-debug \ - --enable-pretty-print-stacktrace \ - --without-slurm \ - --with-hwloc=external \ - --with-libltdl=/usr \ - FC=/usr/bin/gfortran \ - LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" + valgrind="--without-valgrind" else + valgrind="--with-valgrind" + fi + + # Fix fakeroot problem (FS#28644) + patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch + ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ --mandir=/usr/share/man \ @@ -45,7 +35,7 @@ build() { --libdir=/usr/lib/${pkgname} \ --with-threads=posix \ --enable-smp-locks \ - --with-valgrind \ + $valgrind \ --enable-memchecker \ --enable-debug \ --enable-pretty-print-stacktrace \ @@ -54,7 +44,6 @@ build() { --with-libltdl=/usr \ FC=/usr/bin/gfortran \ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" - fi make } @@ -73,7 +62,7 @@ package() { mv "${pkgdir}"/usr/bin/otfinfo{,mpi} # Openmpi's otfdump conflicts with the one from libotf - mv "${pkgdir}"/usr/bin/otfdump{,ompi} + mv "${pkgdir}"/usr/bin/otfdump{,ompi} # Remove dangling symlink rm "${pkgdir}"/usr/share/man/man1/orteCC.1 |