Merge pull request #12026 from mmuetzel/armadillo

armadillo: build HDF5 wrappers
This commit is contained in:
Christoph Reiter
2022-07-11 08:07:18 +02:00
committed by GitHub
2 changed files with 19 additions and 4 deletions

View File

@@ -0,0 +1,12 @@
diff -urN armadillo-11.2.1/include/armadillo_bits/config.hpp.cmake.orig armadillo-11.2.1/include/armadillo_bits/config.hpp.cmake
--- armadillo-11.2.1/include/armadillo_bits/config.hpp.cmake.orig 2022-07-08 13:13:34.710793800 +0200
+++ armadillo-11.2.1/include/armadillo_bits/config.hpp.cmake 2022-07-10 13:46:01.376117300 +0200
@@ -170,7 +170,7 @@
//// Comment out the above line if you don't want automatic checking for nonfinite matrices
#endif
-// #define ARMA_USE_HDF5_ALT
+#cmakedefine ARMA_USE_HDF5_ALT
#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER)
#undef ARMA_USE_HDF5
#define ARMA_USE_HDF5

View File

@@ -4,7 +4,7 @@ _realname=armadillo
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=11.2.1
pkgrel=1
pkgrel=2
pkgdesc="C++ linear algebra library (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -22,10 +22,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
install=${_realname}-${MSYSTEM}.install
source=(https://sourceforge.net/projects/arma/files/${_realname}-${pkgver}.tar.xz
0001-mingw-config-fix.patch
0002-fix-pkgconfig-file.patch)
0002-fix-pkgconfig-file.patch
0003-build-hdf5-wrappers.patch)
sha256sums=('2ed1139340e6c0896f490f0dbec73875b0222e0ed9f4971cf8c41342248b9ec2'
'772719e60eb2970ecb37844382dbcb6d0439f949c5080f9865798115640b612a'
'830adb017e12c0e90671471dc6870a28ee21755a55e95280a04f73c2d65d665b')
'830adb017e12c0e90671471dc6870a28ee21755a55e95280a04f73c2d65d665b'
'a12e3cfa0236f4afe5755bdbccb3fd31b4cb0e98d37ee158238150cf4b8cd2ec')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -41,7 +43,8 @@ prepare() {
apply_patch_with_msg \
0001-mingw-config-fix.patch \
0002-fix-pkgconfig-file.patch
0002-fix-pkgconfig-file.patch \
0003-build-hdf5-wrappers.patch
}
build() {