diff --git a/netcdf/.SRCINFO b/netcdf/.SRCINFO index 7ce1e79678..ce65b4002d 100644 --- a/netcdf/.SRCINFO +++ b/netcdf/.SRCINFO @@ -1,9 +1,13 @@ pkgbase = netcdf pkgdesc = network Common Data Form interface for array-oriented data access and corresponding library pkgver = 4.9.2 - pkgrel = 4 + pkgrel = 6 url = https://www.unidata.ucar.edu/software/netcdf/ arch = x86_64 + arch = powerpc64le + arch = powerpc64 + arch = powerpc + arch = riscv64 license = custom checkdepends = unzip makedepends = cmake diff --git a/netcdf/PKGBUILD b/netcdf/PKGBUILD index 820b5267b9..652c4ef7ce 100644 --- a/netcdf/PKGBUILD +++ b/netcdf/PKGBUILD @@ -5,23 +5,22 @@ pkgname=netcdf pkgver=4.9.2 -pkgrel=4.2 +pkgrel=6 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.unidata.ucar.edu/software/netcdf/" depends=(hdf5 curl libxml2 libaec blosc bzip2 libzip zstd) -makedepends=(cmake git) +makedepends=(cmake) checkdepends=(unzip) optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings') options=(!makeflags) license=(custom) -_commit=d18a6061c2f22cdc21e712a312da3807bec6c54d -source=("git+https://github.com/Unidata/netcdf-c.git#commit=${_commit}") -sha256sums=('f0081a888658814019c3d0550e0aaa25d99a3465472f72cdc850d6ad1726659c') +source=(https://github.com/Unidata/netcdf-c/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz) +sha256sums=('bc104d101278c68b303359b3dc4192f81592ae8640f1aee486921138f7f88cb7') prepare() { # https://github.com/Unidata/netcdf-c/issues/2188 https://github.com/Unidata/netcdf-c/issues/2242 - sed -i "/tst_remote3/d" ${pkgname}-c/ncdap_test/CMakeLists.txt + sed -i "/tst_remote3/d" ${pkgname}-c-${pkgver}/ncdap_test/CMakeLists.txt } build() { @@ -32,6 +31,7 @@ build() { ) ;; powerpc) + export CFLAGS+=' -Wno-incompatible-pointer-types' cmake_options=( -DENABLE_CDF5=OFF -DNETCDF_GENERATE_NCGEN=ON @@ -39,11 +39,19 @@ build() { ;; esac - cmake -B build -S ${pkgname}-c \ + cmake -B build -S ${pkgname}-c-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_BYTERANGE=ON ${cmake_options[@]} + -DPLUGIN_INSTALL_DIR=/usr/lib/netcdf/plugin \ + -DENABLE_BYTERANGE=ON \ + -DENABLE_DAP_LONG_TESTS=ON \ + -DENABLE_DAP_REMOTE_TESTS=ON \ + -DENABLE_EXAMPLE_TESTS=ON \ + -DENABLE_EXTRA_TESTS=ON \ + -DENABLE_FILTER_TESTING=ON \ + -DENABLE_LARGE_FILE_TESTS=ON \ + -DENABLE_UNIT_TESTS=ON ${cmake_options[@]} make -C build } @@ -56,5 +64,5 @@ check() { package() { make -C build DESTDIR="${pkgdir}" install - install -Dm644 ${pkgname}-c/COPYRIGHT -t "${pkgdir}"/usr/share/licenses/${pkgname}/ + install -Dm644 ${pkgname}-c-${pkgver}/COPYRIGHT -t "${pkgdir}"/usr/share/licenses/${pkgname}/ }