diff options
author | GoliathLabs | 2020-06-15 19:43:59 +0200 |
---|---|---|
committer | GoliathLabs | 2020-06-15 19:43:59 +0200 |
commit | da1fe3a1df75ba8cae56256147381b6539fbada3 (patch) | |
tree | 5d76de510341081c46e5d4edc45979d5a60de7db | |
parent | 6159f9bcd6ce8a6e84592947ec490e4b5e29fd4e (diff) | |
download | aur-hdf5-mpich.tar.gz |
Updated: 1.12.0
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 27 | ||||
-rw-r--r-- | hdf5-1.12.0-compat-1.6.patch | 89 | ||||
-rw-r--r-- | mpi.patch | 24 |
4 files changed, 106 insertions, 44 deletions
@@ -1,6 +1,6 @@ pkgbase = hdf5-mpich pkgdesc = General purpose library and file format for storing scientific data (mpich version) (full version including its Java Native Interfaces) - pkgver = 1.10.5 + pkgver = 1.12.0 pkgrel = 1 url = https://portal.hdfgroup.org/display/support arch = x86_64 @@ -13,10 +13,10 @@ pkgbase = hdf5-mpich depends = libaec depends = mpich options = staticlibs - source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2 - source = mpi.patch - md5sums = 7c19d6b81ee2a3ba7d36f6922b2f90d3 - md5sums = 63b43e3d4a5bbea4bcecc84874e08913 + source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.0/src/hdf5-1.12.0.tar.bz2 + source = hdf5-1.12.0-compat-1.6.patch + md5sums = 1fa68c4b11b6ef7a9d72ffa55995f898 + md5sums = afd4d35a187d5c7892e7060e729d4813 pkgname = hdf5-mpich @@ -1,4 +1,6 @@ -# Maintainer : George Eleftheriou <eleftg> +# Maintainer: +# Contributor: Felix Golatofski <contact@xdfr.de> +# Contributor: George Eleftheriou <eleftg> # Contributor: Jingbei Li <petronny> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <archange@archlinux.org> @@ -12,7 +14,7 @@ _pkgname=hdf5 _mpi=mpich pkgname=${_pkgname}-${_mpi} _prefix=/opt/${pkgname} -pkgver=1.10.5 +pkgver=1.12.0 pkgrel=1 pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version) (full version including its Java Native Interfaces)" arch=('x86_64') @@ -22,22 +24,14 @@ depends=('bash' 'libaec' "${_mpi}") makedepends=('cmake' 'time' 'java-environment' 'gcc-fortran') options=('staticlibs') source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" - 'mpi.patch') -md5sums=('7c19d6b81ee2a3ba7d36f6922b2f90d3' - '63b43e3d4a5bbea4bcecc84874e08913') - -prepare() { - mkdir -p build - cd "${_pkgname}-${pkgver}" - - # FS#33343 - patch -p1 -i ../mpi.patch -} + 'hdf5-1.12.0-compat-1.6.patch') +md5sums=('1fa68c4b11b6ef7a9d72ffa55995f898' + 'afd4d35a187d5c7892e7060e729d4813') build() { - cd build - # Crazy workaround: run CMake to generate pkg-config file + mkdir -p build && cd build + RUNPARALLEL="/opt/mpich/bin/mpirun" \ JAVADOC='javadoc -Xdoclint:none' \ cmake ../${_pkgname}-${pkgver} \ @@ -107,4 +101,7 @@ package() { install -Dm644 CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc \ -t "${pkgdir}${_prefix}"/lib/pkgconfig + # Fix 1.6 compatibility for h5py + cd "${pkgdir}"/usr/include/ + patch -p1 -i "${srcdir}"/hdf5-1.12.0-compat-1.6.patch } diff --git a/hdf5-1.12.0-compat-1.6.patch b/hdf5-1.12.0-compat-1.6.patch new file mode 100644 index 000000000000..eda1919dc94b --- /dev/null +++ b/hdf5-1.12.0-compat-1.6.patch @@ -0,0 +1,89 @@ +--- a/H5version.h ++++ b/H5version.h +@@ -97,6 +97,10 @@ + #define H5Ewalk_vers 1 + #endif /* !defined(H5Ewalk_vers) */ + ++#if !defined(H5Fget_info_vers) ++ #define H5Fget_info_vers 1 ++#endif /* !defined(H5Fget_info_vers) */ ++ + #if !defined(H5Gcreate_vers) + #define H5Gcreate_vers 1 + #endif /* !defined(H5Gcreate_vers) */ +@@ -105,6 +109,38 @@ + #define H5Gopen_vers 1 + #endif /* !defined(H5Gopen_vers) */ + ++#if !defined(H5Lget_info_vers) ++ #define H5Lget_info_vers 1 ++#endif /* !defined(H5Lget_info_vers) */ ++ ++#if !defined(H5Lget_info_by_idx_vers) ++ #define H5Lget_info_by_idx_vers 1 ++#endif /* !defined(H5Lget_info_by_idx_vers) */ ++ ++#if !defined(H5Oget_info_vers) ++ #define H5Oget_info_vers 1 ++#endif /* !defined(H5Oget_info_vers) */ ++ ++#if !defined(H5Oget_info_by_idx_vers) ++ #define H5Oget_info_by_idx_vers 1 ++#endif /* !defined(H5Oget_info_by_idx_vers) */ ++ ++#if !defined(H5Oget_info_by_name_vers) ++ #define H5Oget_info_by_name_vers 1 ++#endif /* !defined(H5Oget_info_by_name_vers) */ ++ ++#if !defined(H5Ovisit_vers) ++ #define H5Ovisit_vers 1 ++#endif /* !defined(H5Ovisit_vers) */ ++ ++#if !defined(H5Ovisit_by_name_vers) ++ #define H5Ovisit_by_name_vers 1 ++#endif /* !defined(H5Ovisit_by_name_vers) */ ++ ++#if !defined(H5Pencode_vers) ++ #define H5Pencode_vers 1 ++#endif /* !defined(H5Pencode_vers) */ ++ + #if !defined(H5Pget_filter_vers) + #define H5Pget_filter_vers 1 + #endif /* !defined(H5Pget_filter_vers) */ +@@ -133,6 +169,10 @@ + #define H5Tarray_create_vers 1 + #endif /* !defined(H5Tarray_create_vers) */ + ++#if !defined(H5Sencode_vers) ++ #define H5Sencode_vers 1 ++#endif /* !defined(H5Sencode_vers) */ ++ + #if !defined(H5Tcommit_vers) + #define H5Tcommit_vers 1 + #endif /* !defined(H5Tcommit_vers) */ +@@ -153,6 +193,14 @@ + #define H5E_auto_t_vers 1 + #endif /* !defined(H5E_auto_t_vers) */ + ++#if !defined(H5O_info_t_vers) ++ #define H5O_info_t_vers 1 ++#endif /* !defined(H5O_info_t_vers) */ ++ ++#if !defined(H5O_iterate_t_vers) ++ #define H5O_iterate_t_vers 1 ++#endif /* !defined(H5O_iterate_t_vers) */ ++ + #if !defined(H5Z_class_t_vers) + #define H5Z_class_t_vers 1 + #endif /* !defined(H5Z_class_t_vers) */ +@@ -261,6 +309,10 @@ + #define H5Ovisit_by_name_vers 1 + #endif /* !defined(H5Ovisit_by_name_vers) */ + ++#if !defined(H5Pencode_vers) ++ #define H5Pencode_vers 1 ++#endif /* !defined(H5Pencode_vers) */ ++ + #if !defined(H5Pget_filter_vers) + #define H5Pget_filter_vers 2 + #endif /* !defined(H5Pget_filter_vers) */ diff --git a/mpi.patch b/mpi.patch deleted file mode 100644 index e435f9be3ff5..000000000000 --- a/mpi.patch +++ /dev/null @@ -1,24 +0,0 @@ -Prevent accidental inclusion of mpi c++ headers -when hdf5.h is included third party library - -https://bugs.gentoo.org/show_bug.cgi?id=420777 -https://bugs.archlinux.org/task/33343 - ---- a/src/H5public.h -+++ b/src/H5public.h -@@ -57,6 +57,15 @@ - # include <stddef.h> - #endif - #ifdef H5_HAVE_PARALLEL -+# ifndef OMPI_SKIP_MPICXX -+# define OMPI_SKIP_MPICXX -+# endif -+# ifndef MPICH_IGNORE_CXX_SEEK -+# define MPICH_IGNORE_CXX_SEEK -+# endif -+# ifndef MPICH_SKIP_MPICXX -+# define MPICH_SKIP_MPICXX -+# endif - # include <mpi.h> - #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ - # include <mpio.h> |