From bb2cd1d5671239ceeff5b3f0a2a7390a336328e5 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 20 Jun 2017 05:00:42 +0000
Subject: [PATCH] extra/openmpi to 2.1.1-1

---
 extra/openmpi/PKGBUILD | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 9dc565e7b..a2e30e3d1 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -6,8 +6,8 @@
 #  - only use valgrind with v7/v8
 
 pkgname=openmpi
-pkgver=1.10.6
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
 pkgdesc='High performance message passing library (MPI)'
 arch=(i686 x86_64)
 url='http://www.open-mpi.org'
@@ -19,7 +19,7 @@ makedepends_aarch64=(valgrind)
 optdepends=('gcc-fortran: fortran support')
 options=(staticlibs)
 source=(http://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('cbb3121d30869ee89b5484af274b6b477d8ac72f')
+sha1sums=('3aaee35c17b6ef02f4cee274f2670d5b7b2c968a')
 
 build() {
    cd $pkgname-$pkgver
@@ -27,13 +27,15 @@ build() {
    # enable valgrind and memchecker for v7
    [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--with-valgrind --enable-memchecker'
 
-   ./autogen.pl
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --enable-mpi-fortran=all \
                --libdir=/usr/lib/${pkgname} \
                --with-threads=posix \
+               --enable-mpi-thread-multiple \
                --enable-smp-locks \
+               --enable-builtin-atomics \
+               --enable-mpi-cxx \
                --enable-pretty-print-stacktrace \
                --without-slurm \
                --with-hwloc=/usr \
@@ -61,12 +63,6 @@ package() {
       ln -sf /usr/lib/openmpi/pkgconfig/$i "$pkgdir"/usr/lib/pkgconfig/
    done
 
-   # Openmpi's otfinfo conflicts with the one from texlive
-   mv "$pkgdir"/usr/bin/otfinfo{,mpi}
-
-   # Remove dangling symlink and useless file
-   rm "$pkgdir"/usr/share/vampirtrace/config.log
-
    install -d -m 755 "$pkgdir"/etc/ld.so.conf.d
    echo "/usr/lib/$pkgname" > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf