[arch-commits] Commit in netcdf-openmpi/trunk (PKGBUILD)
Bruno Pagani
archange at gemini.archlinux.org
Mon Jun 27 15:39:29 UTC 2022
Date: Monday, June 27, 2022 @ 15:39:29
Author: archange
Revision: 1239702
Fix one test, disable another, enable some more
Modified:
netcdf-openmpi/trunk/PKGBUILD
----------+
PKGBUILD | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-27 15:39:23 UTC (rev 1239701)
+++ PKGBUILD 2022-06-27 15:39:29 UTC (rev 1239702)
@@ -6,7 +6,7 @@
_mpi=openmpi
pkgname=${_pkg}-${_mpi}
pkgver=4.9.0
-pkgrel=1
+pkgrel=2
pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library with parallel support (${_mpi} version)"
arch=(x86_64)
url="https://www.unidata.ucar.edu/software/netcdf/"
@@ -19,19 +19,24 @@
conflicts=("${_pkg}")
options=(!makeflags)
source=(https://github.com/Unidata/netcdf-c/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
- netcdf-4.9.0-fix-cmake-typo.patch::https://github.com/Unidata/netcdf-c/commit/80a6611cfca98a5979c5ac69cba56a49af8c1e48.patch)
+ netcdf-4.9.0-fix-cmake-typo.patch::https://github.com/Unidata/netcdf-c/pull/2412.patch
+ netcdf-4.9.0-read-chunk-size.patch::https://github.com/Unidata/netcdf-c/pull/2319.patch)
sha256sums=('9f4cb864f3ab54adb75409984c6202323d2fc66c003e5308f3cdf224ed41c0a6'
- 'ed45ae6c49cf8dcddaadef4c5cf403049bf3f761187413d7b03754d319345d6a')
-
+ 'ed45ae6c49cf8dcddaadef4c5cf403049bf3f761187413d7b03754d319345d6a'
+ 'd71b441b6499d6ddb97ea25377018000781d16de6551f0d2ba33b9bcd6e769fd')
prepare() {
+ # https://github.com/Unidata/netcdf-c/issues/2188 https://github.com/Unidata/netcdf-c/issues/2242
+ sed -i "/tst_remote3/d" ${_pkg}-c-${pkgver}/ncdap_test/CMakeLists.txt
+ # https://github.com/Unidata/netcdf-c/issues/2390
patch -p1 -d ${_pkg}-c-${pkgver} < netcdf-4.9.0-fix-cmake-typo.patch
- # https://github.com/Unidata/netcdf-c/issues/2242
- sed -i "/add_sh_test(ncdap tst_remote3)/d" ${_pkg}-c-${pkgver}/ncdap_test/CMakeLists.txt
+ # https://github.com/Unidata/netcdf-c/issues/2418
+ patch -p1 -d ${_pkg}-c-${pkgver} < netcdf-4.9.0-read-chunk-size.patch
+ # https://github.com/Unidata/netcdf-c/issues/24
+ sed -i "/run_pnetcdf_test/d" ${_pkg}-c-${pkgver}/nc_test/CMakeLists.txt
}
build() {
export CC=mpicc
- # Disabling remote tests because of https://github.com/Unidata/netcdf-c/issues/2188
cmake -B build -S ${_pkg}-c-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -39,8 +44,8 @@
-DENABLE_BYTERANGE=ON \
-DENABLE_CDF5=ON \
-DENABLE_PNETCDF=ON \
- -DENABLE_DAP_LONG_TESTS=OFF \
- -DENABLE_DAP_REMOTE_TESTS=OFF \
+ -DENABLE_DAP_LONG_TESTS=ON \
+ -DENABLE_DAP_REMOTE_TESTS=ON \
-DENABLE_EXAMPLE_TESTS=ON \
-DENABLE_EXTRA_TESTS=ON \
-DENABLE_FILTER_TESTING=ON \
@@ -54,9 +59,10 @@
# 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
+ # We don’t have CUDA by default
+ export OMPI_MCA_opal_warn_on_missing_libcuda=0
- # https://github.com/Unidata/netcdf-c/issues/2418
- make -C build test || echo "Tests failed"
+ make -C build test
}
package() {
More information about the arch-commits
mailing list