[arch-commits] Commit in mgard/trunk (PKGBUILD mgard-fix-includedir.patch)

[Bruno Pagani]

    Date: Friday, July 23, 2021 @ 00:48:53
  Author: archange
Revision: 984115

Fix include dir for all files

Added:
  mgard/trunk/mgard-fix-includedir.patch
Modified:
  mgard/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   17 +++++++++++++----
 mgard-fix-includedir.patch |   13 +++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-22 22:52:39 UTC (rev 984114)
+++ PKGBUILD	2021-07-23 00:48:53 UTC (rev 984115)
@@ -2,7 +2,7 @@
 
 pkgname=mgard
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="MultiGrid Adaptive Reduction of Data"
 arch=(x86_64)
 url="https://github.com/CODARcode/MGARD"
@@ -9,9 +9,16 @@
 license=(Apache)
 depends=(glibc zlib zstd)
 makedepends=(cmake)
-source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('254cc77ca678c746c3808d7fb76c289fce17f2cbb84a1892d6cd2ea078be62f0')
+source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        mgard-fix-includedir.patch)
+sha256sums=('254cc77ca678c746c3808d7fb76c289fce17f2cbb84a1892d6cd2ea078be62f0'
+            '347a5ef495c1e423a590b53b080a9c4874e425e64fa2e154eca35534eae07d6d')
 
+prepare() {
+  cd ${pkgname^^}-${pkgver}
+  patch -p1 < ../mgard-fix-includedir.patch
+}
+
 build() {
   cmake -B build -S ${pkgname^^}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr
@@ -21,9 +28,11 @@
 check() {
   cd build
   # https://github.com/CODARcode/MGARD/issues/105
-  ctest -v || echo "Tests failed"
+  ctest -v --output-on-failure || echo "Tests failed"
 }
 
 package() {
   make -C build DESTDIR="${pkgdir}" install
+  # Uneeded file
+  rm "${pkgdir}"/usr/include/mgard/MGARDConfig.h.in
 }

Added: mgard-fix-includedir.patch
===================================================================
--- mgard-fix-includedir.patch	                        (rev 0)
+++ mgard-fix-includedir.patch	2021-07-23 00:48:53 UTC (rev 984115)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a848101..a04c158 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,7 +204,7 @@ install(
+ 	include/TensorMeshHierarchy.hpp
+         ${MGARD_CUDA_HEADER}
+ 	"${PROJECT_BINARY_DIR}/include/MGARDConfig.h"
+-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mgard
+ )
+ install(
+   DIRECTORY