[arch-commits] Commit in netcdf-openmpi/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Wednesday, July 21, 2021 @ 18:16:38
  Author: archange
Revision: 982579

upgpkg: netcdf-openmpi 4.8.0-1

Modified:
  netcdf-openmpi/trunk/PKGBUILD

----------+
 PKGBUILD |   61 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-21 18:16:28 UTC (rev 982578)
+++ PKGBUILD	2021-07-21 18:16:38 UTC (rev 982579)
@@ -5,7 +5,7 @@
 _pkg=netcdf
 _mpi=openmpi
 pkgname=${_pkg}-${_mpi}
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library with parallel support (${_mpi} version)"
 arch=(x86_64)
@@ -18,36 +18,51 @@
 provides=("${_pkg}")
 conflicts=("${_pkg}")
 options=(!makeflags)
-source=(https://github.com/Unidata/netcdf-c/archive/v${pkgver}/${_pkg}-${pkgver}.tar.gz)
-sha256sums=('99930ad7b3c4c1a8e8831fb061cb02b2170fc8e5ccaeda733bd99c3b9d31666b')
+source=(https://github.com/Unidata/netcdf-c/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        netcdf-fix-tst_h_atts3-hdf5-1.12.patch::https://patch-diff.githubusercontent.com/raw/Unidata/netcdf-c/pull/1980.patch
+        netcdf-fix-H5Epush_ret-hdf5-1.12.1.patch::https://patch-diff.githubusercontent.com/raw/Unidata/netcdf-c/pull/2034.patch)
+sha256sums=('aff58f02b1c3e91dc68f989746f652fe51ff39e6270764e484920cb8db5ad092'
+            'db10788679c0240a2b3b422b24198ca5199973098c238a3e42b1989d5cf22dee'
+            'dd7c77c364bc513092f91fbb3286778bfd1aff6c2bfb7bb7fc19077db204c2b6')
 
+prepare() {
+  cd ${_pkg}-c-${pkgver}
+  patch -p1 -i ../netcdf-fix-tst_h_atts3-hdf5-1.12.patch
+  patch -p1 -i ../netcdf-fix-H5Epush_ret-hdf5-1.12.1.patch
+}
+
 build() {
-    export CC=mpicc
-    cmake -B build -S ${_pkg}-c-${pkgver} \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DENABLE_CDF5=ON \
-        -DENABLE_PNETCDF=ON \
-        -DENABLE_DAP_LONG_TESTS=ON \
-        -DENABLE_EXAMPLE_TESTS=ON \
-        -DENABLE_EXTRA_TESTS=ON \
-        -DENABLE_FAILING_TESTS=ON \
-        -DENABLE_FILTER_TESTING=ON \
-        -DENABLE_LARGE_FILE_TESTS=ON
-    make -C build
+  export CC=mpicc
+  # https://github.com/Unidata/netcdf-c/issues/1965
+  export CPPFLAGS+=" -DH5_USE_110_API"
+  # https://github.com/Unidata/netcdf-c/issues/1983
+  export CFLAGS+=" -fno-strict-aliasing"
+  cmake -B build -S ${_pkg}-c-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DENABLE_BYTERANGE=ON \
+    -DENABLE_CDF5=ON \
+    -DENABLE_PNETCDF=ON \
+    -DENABLE_DAP_LONG_TESTS=ON \
+    -DENABLE_EXAMPLE_TESTS=ON \
+    -DENABLE_EXTRA_TESTS=ON \
+    -DENABLE_FILTER_TESTING=ON \
+    -DENABLE_LARGE_FILE_TESTS=ON \
+    -DENABLE_UNIT_TESTS=ON
+  make -C build
 }
 
 
 check() {
-    # This is required starting with OpenMPI 3.0 when trying to run more
-    # processes than the number of available cores
-    export OMPI_MCA_rmaps_base_oversubscribe=yes
+  # This is required starting with OpenMPI 3.0 when trying to run more
+  # processes than the number of available cores
+  export OMPI_MCA_rmaps_base_oversubscribe=yes
 
-    make -C build test
+  make -C build test
 }
 
 package() {
-    make -C build DESTDIR="${pkgdir}" install
-    install -Dm644 ${_pkg}-c-${pkgver}/COPYRIGHT -t "${pkgdir}"/usr/share/licenses/${_pkg}/
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm644 ${_pkg}-c-${pkgver}/COPYRIGHT -t "${pkgdir}"/usr/share/licenses/${_pkg}/
 }