diff --git a/mgard/.SRCINFO b/mgard/.SRCINFO index 558b99d18f..2219c5e315 100644 --- a/mgard/.SRCINFO +++ b/mgard/.SRCINFO @@ -1,10 +1,12 @@ pkgbase = mgard pkgdesc = MultiGrid Adaptive Reduction of Data pkgver = 1.5.2 - pkgrel = 2 + pkgrel = 4 url = https://github.com/CODARcode/MGARD - arch = riscv64 + arch = x86_64 arch = powerpc64le + arch = powerpc64 + arch = powerpc arch = riscv64 license = Apache-2.0 makedepends = catch2 @@ -20,6 +22,8 @@ pkgbase = mgard depends = zstd depends = libzstd.so source = https://github.com/CODARcode/MGARD/archive/1.5.2/mgard-1.5.2.tar.gz + source = mgard-pr-186.patch::https://patch-diff.githubusercontent.com/raw/CODARcode/MGARD/pull/186.patch b2sums = fbebe814483f7ebbfd1f3bc33ca387fe77f7b0f0de369e5c4d2525d01172146197458e1a070824a8697fd0b9acef267f5813562aa9848db32d9175f879ce13f7 + b2sums = 627d63a928cb0a2abe828f6cead63063ed03aef96675dd0aceb8d7bfb6fe5452f2d202478e495a4aac05292ead726181f6d3b1bc0275892b7380a095ed0988d1 pkgname = mgard diff --git a/mgard/PKGBUILD b/mgard/PKGBUILD index 4535f80ddd..60279fabc6 100644 --- a/mgard/PKGBUILD +++ b/mgard/PKGBUILD @@ -4,9 +4,9 @@ pkgname=mgard pkgver=1.5.2 -pkgrel=2 +pkgrel=4 pkgdesc="MultiGrid Adaptive Reduction of Data" -arch=(riscv64 powerpc64le riscv64) +arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://github.com/CODARcode/MGARD" license=(Apache-2.0) depends=( @@ -23,21 +23,30 @@ makedepends=( python #tclap # 1.4 required but not packaged ) -source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz) -b2sums=('fbebe814483f7ebbfd1f3bc33ca387fe77f7b0f0de369e5c4d2525d01172146197458e1a070824a8697fd0b9acef267f5813562aa9848db32d9175f879ce13f7') +source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz + ${pkgname}-pr-186.patch::https://patch-diff.githubusercontent.com/raw/CODARcode/MGARD/pull/186.patch) +b2sums=('fbebe814483f7ebbfd1f3bc33ca387fe77f7b0f0de369e5c4d2525d01172146197458e1a070824a8697fd0b9acef267f5813562aa9848db32d9175f879ce13f7' + '627d63a928cb0a2abe828f6cead63063ed03aef96675dd0aceb8d7bfb6fe5452f2d202478e495a4aac05292ead726181f6d3b1bc0275892b7380a095ed0988d1') + +prepare() { + cd ${pkgname^^}-${pkgver} + patch -Np1 -i ${srcdir}/${pkgname}-pr-186.patch +} build() { - local cmake_flags=( - -B build -S ${pkgname^^}-${pkgver} -G Ninja + local cmake_options=( + -B build + -S ${pkgname^^}-${pkgver} + -G Ninja + -W no-dev -DCMAKE_INSTALL_PREFIX=/usr -DMGARD_ENABLE_SERIAL=ON -DMGARD_ENABLE_OPENMP=ON -DMGARD_ENABLE_MDR=ON #-DMGARD_ENABLE_CLI=ON requires tclap 1.4 -DBUILD_TESTING=ON - -Wno-dev ) - cmake "${cmake_flags[@]}" + cmake "${cmake_options[@]}" cmake --build build }