diff options
| author | Ruben Di Battista | 2022-01-11 00:12:28 +0100 |
|---|---|---|
| committer | Ruben Di Battista | 2022-01-11 00:18:00 +0100 |
| commit | 64fb60a5bd7b65709bd74edf24776125e995d752 (patch) | |
| tree | 3ad3b7ac1561d1e0c671868870190df47ae83895 | |
| parent | 4ea63e58c8f3cfad30f11b5b53aaaade0d28d7aa (diff) | |
| download | aur-64fb60a5bd7b65709bd74edf24776125e995d752.tar.gz | |
Builds
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | hid_t_int64.patch | 60 |
3 files changed, 73 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..305a6adca29f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +src*/ +pkg/ +xdmf/ +*.zst @@ -1,4 +1,3 @@ - pkgname='xdmf-git' pkgver=3.0.r2461.04a84bab pkgrel=1 @@ -10,7 +9,7 @@ depends=('hdf5' 'libxml2' 'libtiff') makedepends=('cmake' 'boost' 'doxygen') provides=('xdmf') conflicts=('xdmf') -source=("git+https://gitlab.kitware.com/xdmf/xdmf.git") +source=("git+https://gitlab.kitware.com/xdmf/xdmf.git" "hid_t_int64.patch") sha256sums=('SKIP') pkgver() { @@ -18,6 +17,11 @@ pkgver() { printf "3.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +prepare() { + cd "$srcdir/xdmf" + patch --forward --strip=2 --input="${srcdir}/hid_t_int64.patch" +} + build() { cd xdmf mkdir -p build && cd build @@ -25,7 +29,7 @@ build() { -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DXDMF_BUILD_DOCUMENTATION=ON \ + -DXDMF_BUILD_DOCUMENTATION=OFF\ -DXDMF_BUILD_TESTING=OFF \ -DXDMF_BUILD_UTILS=ON \ -DXDMF_WRAP_PYTHON=OFF \ @@ -38,3 +42,5 @@ package() { cd xdmf/build make DESTDIR="$pkgdir/" install } +sha256sums=('SKIP' + '41d8707c40e6e5fe3828f0427791e61bf0aee4582cf1e985884edb86cb713f01') diff --git a/hid_t_int64.patch b/hid_t_int64.patch new file mode 100644 index 000000000000..db780fc2ada9 --- /dev/null +++ b/hid_t_int64.patch @@ -0,0 +1,60 @@ +diff --color --unified --recursive --text src.old/xdmf/core/CMakeLists.txt src/xdmf/core/CMakeLists.txt +--- src.old/xdmf/core/CMakeLists.txt 2022-01-10 23:22:52.940028728 +0100 ++++ src/xdmf/core/CMakeLists.txt 2022-01-10 23:55:29.950022745 +0100 +@@ -29,6 +29,9 @@ + if(HDF5_FOUND) + include_directories(${HDF5_INCLUDE_DIRS}) + include_directories(${HDF5_C_INCLUDE_DIR}) ++ if(HDF5_VERSION VERSION_GREATER "1.12.0") ++ set(XDMF_HID_T_64 TRUE) ++ endif() + # FIXME: Would like to get this info from HDF5 so we don't have conflicting + # MPI versions + if(HDF5_IS_PARALLEL) +diff --color --unified --recursive --text src.old/xdmf/core/XdmfCoreConfig.hpp.in src/xdmf/core/XdmfCoreConfig.hpp.in +--- src.old/xdmf/core/XdmfCoreConfig.hpp.in 2022-01-10 23:22:52.940028728 +0100 ++++ src/xdmf/core/XdmfCoreConfig.hpp.in 2022-01-10 23:56:44.850022516 +0100 +@@ -29,9 +29,10 @@ + + #cmakedefine BUILD_SHARED + #ifndef BUILD_SHARED +-# define XDMFSTATIC ++#define XDMFSTATIC + #endif + + #cmakedefine XDMF_NO_REALPATH ++#cmakedefine XDMF_HID_T_64 + + #endif /* XDMFCORECONFIG_HPP_ */ +diff --color --unified --recursive --text src.old/xdmf/core/XdmfHDF5Controller.hpp src/xdmf/core/XdmfHDF5Controller.hpp +--- src.old/xdmf/core/XdmfHDF5Controller.hpp 2022-01-10 23:22:52.940028728 +0100 ++++ src/xdmf/core/XdmfHDF5Controller.hpp 2022-01-10 23:55:29.950022745 +0100 +@@ -33,7 +33,11 @@ + #ifndef _H5Ipublic_H + #ifndef XDMF_HID_T + #define XDMF_HID_T +- typedef int hid_t; ++ #ifndef XDMF_HID_T_64 ++ typedef int hid_t; ++ #else ++ typedef int64_t hid_t; ++ #endif + #endif + #endif + +diff --color --unified --recursive --text src.old/xdmf/core/XdmfHDF5Writer.hpp src/xdmf/core/XdmfHDF5Writer.hpp +--- src.old/xdmf/core/XdmfHDF5Writer.hpp 2022-01-10 23:22:52.950028728 +0100 ++++ src/xdmf/core/XdmfHDF5Writer.hpp 2022-01-10 23:55:29.950022745 +0100 +@@ -34,7 +34,11 @@ + #ifndef _H5Ipublic_H + #ifndef XDMF_HID_T + #define XDMF_HID_T +- typedef int hid_t; ++ #ifndef XDMF_HID_T_64 ++ typedef int hid_t; ++ #else ++ typedef int64_t hid_t; ++ #endif + #endif + #endif + |