From 2baf79cfeaa4a8090b538d6aa9af4ab187e3d70f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 7 Jun 2022 12:35:30 +0000
Subject: [PATCH] extra/openmpi to 4.1.4-1

---
 extra/openmpi/PKGBUILD | 91 ++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 43 deletions(-)

diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index cd81c9662..7e5bdb77f 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,72 +1,77 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: David Runge <dvzrv@archlinux.org>
 # Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org
-#  - only use valgrind with v7/v8
-#  - remove make/optdepend on cude and configure option
-#  - explicitly link v5 with libatomic
+#  - remove make/optdepend on cuda and configure option
 
 pkgname=openmpi
-pkgver=4.1.2
+pkgver=4.1.4
 pkgrel=1
 pkgdesc='High performance message passing library (MPI)'
+arch=(x86_64)
 url='https://www.open-mpi.org'
-arch=('x86_64')
 license=('custom:OpenMPI')
-depends=('glibc' 'libltdl' 'hwloc' 'openssh' 'zlib' 'libnl' 'perl' 'libevent')
-makedepends=('inetutils' 'gcc-fortran')
-makedepends_armv7h=('valgrind')
-makedepends_aarch64=('valgrind')
-optdepends=('gcc-fortran: fortran support')
-options=('staticlibs')
-source=(https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527')
-b2sums=('2e6fc12b4564a302d2c364528d0f6bea8b23f9b1cd6059763b8d5de583d86aae2812c239b1d0bb40c83f3c7682c8e666ce1de3112e95de54848169cb5e2805e8')
+depends=(gcc-libs glibc hwloc libevent libnl openpmix zlib)
+makedepends=(gcc-fortran inetutils valgrind)
+optdepends=(
+  'gcc-fortran: fortran support'
+  'openssh: for offloading to remote hosts'
+  'perl: for aggregate_profile.pl and profile2mat.pl'
+)
+provides=(
+  libmca_common_cuda.so
+  libmca_common_monitoring.so
+  libmca_common_ompio.so
+  libmca_common_sm.so
+  libmpi.so
+  libmpi_cxx.so
+  libmpi_mpifh.so
+  libmpi_usempi_ignore_tkr.so
+  libmpi_usempif08.so
+  libompitrace.so
+  libopen-pal.so
+  libopen-rte.so
+)
+options=(debug)
+source=(https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/$pkgname-$pkgver.tar.bz2)
+sha256sums=('92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d')
+b2sums=('b020e3530ae5dde7b144e7c33b1a3f26f622526a4b48a97a0956fc6f49bbf9dfd5be9ebeeaf3bdc5168a307507408ba5dd8e2a537148821e1d476678177dc5d6')
 
 build() {
-  cd ${pkgname}-${pkgver}
-
-   # enable valgrind and memchecker for v7/v8
-   [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--with-valgrind --enable-memchecker'
-   [[ $CARCH == "arm" ]] && LDFLAGS+=" -Wl,--no-as-needed -latomic -Wl,--as-needed"
+  cd $pkgname-$pkgver
 
+  # TODO: depend on prrte with openmpi >= 5
   ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc/${pkgname} \
-    --enable-mpi-fortran=all \
-    --libdir=/usr/lib/${pkgname} \
     --enable-builtin-atomics \
+    --enable-memchecker \
     --enable-mpi-cxx \
+    --enable-mpi-fortran=all \
     --enable-pretty-print-stacktrace \
-    --without-slurm \
-    --with-hwloc=/usr \
-    --with-libltdl=/usr  \
-    --with-libevent=/usr  \
-    FC=/usr/bin/gfortran \
-    LDFLAGS="${LDFLAGS} -Wl,-z,noexecstack" \
-    $CONFIG
-  make
+    --libdir=/usr/lib \
+    --sysconfdir=/etc/$pkgname \
+    --with-hwloc=external \
+    --with-libevent=external \
+    --with-pmix=external \
+    --with-valgrind \
+    --without-slurm
+
+  # prevent excessive overlinking due to libtool
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make V=1
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
-  make check
+  make check -C $pkgname-$pkgver
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  depends+=(libpmix.so)
 
-  # FS#28583
-  install -dm 755 "${pkgdir}/usr/lib/pkgconfig"
-  for i in "${pkgdir}/usr/lib/openmpi/pkgconfig/"*.pc; do
-    ln -sf "/usr/lib/openmpi/pkgconfig/$(basename ${i})" "${pkgdir}/usr/lib/pkgconfig/"
-  done
-
-  install -dm 755 "${pkgdir}/etc/ld.so.conf.d"
-  echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
+  install -Dm 644 $pkgname-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 # vim: ts=2 sw=2 et: