[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD hdf5-1.12.0-compat-1.6.patch)

2020-04-24 Thread Bruno Pagani via arch-commits 
Date: Friday, April 24, 2020 @ 22:13:20
  Author: archange
Revision: 619601

Fix 1.6 compatibility API for h5py

Added:
  hdf5-openmpi/trunk/hdf5-1.12.0-compat-1.6.patch
Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++--
 hdf5-1.12.0-compat-1.6.patch |   89 +
 2 files changed, 97 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-24 22:02:32 UTC (rev 619600)
+++ PKGBUILD2020-04-24 22:13:20 UTC (rev 619601)
@@ -10,7 +10,7 @@
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=(x86_64)
 url="https://www.hdfgroup.org/hdf5;
@@ -21,8 +21,10 @@
 conflicts=(hdf5)
 replaces=(hdf5-fortran-${_mpi})
 options=(staticlibs)
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;)
-sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
+hdf5-1.12.0-compat-1.6.patch)
+sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61'
+'72ad497c56760bb3af8193c88d3fa264125829850b843697de55d934c56f7f44')
 
 build() {
 # Crazy workaround: run CMake to generate pkg-config file
@@ -90,4 +92,7 @@
 install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgname}
 # Install pkg-config files from CMake tree
 install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t 
"${pkgdir}"/usr/lib/pkgconfig/
+# Fix 1.6 compatibility for h5py
+cd "${pkgdir}"/usr/include/
+patch -p1 -i "${srcdir}"/hdf5-1.12.0-compat-1.6.patch
 }

Added: hdf5-1.12.0-compat-1.6.patch
===
--- hdf5-1.12.0-compat-1.6.patch(rev 0)
+++ hdf5-1.12.0-compat-1.6.patch2020-04-24 22:13:20 UTC (rev 619601)
@@ -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) */

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2020-04-10 Thread Bruno Pagani via arch-commits 
Date: Saturday, April 11, 2020 @ 00:29:34
  Author: archange
Revision: 613200

upgpkg: hdf5-openmpi 1.12.0-1

Patch has been finally upstreamed

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   38 --
 1 file changed, 12 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-10 23:43:49 UTC (rev 613199)
+++ PKGBUILD2020-04-11 00:29:34 UTC (rev 613200)
@@ -9,29 +9,21 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.5
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.hdfgroup.org/hdf5;
-license=('custom')
-depends=('zlib' 'libaec' 'bash' 'openmpi')
-makedepends=('cmake' 'time' 'gcc-fortran')
-provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
-conflicts=('hdf5')
-replaces=("hdf5-fortran-${_mpi}")
-options=('staticlibs')
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
-'mpi.patch')
-sha256sums=('68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44'
-'603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
+license=(custom)
+depends=(zlib libaec bash ${_mpi})
+makedepends=(cmake time gcc-fortran)
+provides=(hdf5 hdf5-cpp-fortran hdf5-fortran-${_mpi})
+conflicts=(hdf5)
+replaces=(hdf5-fortran-${_mpi})
+options=(staticlibs)
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;)
+sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61')
 
-prepare() {
-cd ${_pkgname}-${pkgver/_/-}
-# FS#33343
-patch -p1 -i ../mpi.patch
-}
-
 build() {
 # Crazy workaround: run CMake to generate pkg-config file
 mkdir -p build && cd build
@@ -64,6 +56,7 @@
 OMPI_MCA_disable_memory_allocator=1 \
 --prefix=/usr \
 --docdir=/usr/share/doc/hdf5/ \
+--with-examplesdir='${DESTDIR}/${prefix}/share/doc/hdf5/examples' \
 --enable-static \
 --disable-sharedlib-rpath \
 --enable-build-mode=production \
@@ -93,15 +86,8 @@
 
 package() {
 cd ${_pkgname}-${pkgver/_/-}
-
 make DESTDIR="${pkgdir}" install
-
-# Move examples to a proper place
-install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
-
 install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgname}
-
 # Install pkg-config files from CMake tree
 install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t 
"${pkgdir}"/usr/lib/pkgconfig/
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2019-03-16 Thread Bruno Pagani via arch-commits 
Date: Saturday, March 16, 2019 @ 21:31:43
  Author: archange
Revision: 442244

upgpkg: hdf5-openmpi 1.10.5-1

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 21:02:38 UTC (rev 442243)
+++ PKGBUILD2019-03-16 21:31:43 UTC (rev 442244)
@@ -9,8 +9,8 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.4
-pkgrel=2
+pkgver=1.10.5
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5;
@@ -22,17 +22,14 @@
 replaces=("hdf5-fortran-${_mpi}")
 options=('staticlibs')
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
-'mpi.patch'
-'remove-openmpi-1.0-interfaces.patch')
-sha256sums=('1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df'
-'603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca'
-'41b1277843492b055ae448910cb03869b533364fdde585afbe1bbed0377ffaa3')
+'mpi.patch')
+sha256sums=('68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44'
+'603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {
 cd ${_pkgname}-${pkgver/_/-}
 # FS#33343
 patch -p1 -i ../mpi.patch
-patch -p1 -i ../remove-openmpi-1.0-interfaces.patch
 }
 
 build() {
@@ -99,9 +96,6 @@
 
 make DESTDIR="${pkgdir}" install
 
-# Remove leftover test files
-rm "${pkgdir}"/usr/include/tst{ds,image,lite,table}{,_tests}.mod
-
 # Move examples to a proper place
 install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
 mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-10-22 Thread Bruno Pagani via arch-commits 
Date: Monday, October 22, 2018 @ 15:58:34
  Author: archange
Revision: 398409

upgpkg: hdf5-openmpi 1.10.4-1

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 15:29:17 UTC (rev 398408)
+++ PKGBUILD2018-10-22 15:58:34 UTC (rev 398409)
@@ -9,8 +9,8 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.3
-pkgrel=2
+pkgver=1.10.4
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5;
@@ -23,9 +23,7 @@
 options=('staticlibs')
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
 'mpi.patch')
-md5sums=('56c5039103c51a40e493b43c504ce982'
- 'dfa8dd50b8a7ebb3ad7249c627156cf9')
-sha256sums=('c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9'
+sha256sums=('1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df'
 '603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-09-24 Thread Bruno Pagani via arch-commits 
Date: Monday, September 24, 2018 @ 18:29:38
  Author: archange
Revision: 384675

Work around autotools vs CMake differences

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   63 ++---
 1 file changed, 48 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-24 17:03:28 UTC (rev 384674)
+++ PKGBUILD2018-09-24 18:29:38 UTC (rev 384675)
@@ -10,7 +10,7 @@
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
 pkgver=1.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5;
@@ -29,8 +29,6 @@
 '603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {
-mkdir -p build
-
 cd ${_pkgname}-${pkgver/_/-}
 # FS#33343
 patch -p1 -i ../mpi.patch
@@ -37,7 +35,8 @@
 }
 
 build() {
-cd build
+# Crazy workaround: run CMake to generate pkg-config file
+mkdir -p build && cd build
 CXX="mpicxx" \
 CC="mpicc" \
 FC="mpif90" \
@@ -56,24 +55,58 @@
 -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
 -DHDF5_ENABLE_SZIP_SUPPORT=ON \
 -DHDF5_ENABLE_SZIP_ENCODING=ON
-cmake --build . --config Release
+# But don’t build with it, it’s quite broken
+cd ../${_pkgname}-${pkgver/_/-}
+./configure \
+CXX="mpicxx" \
+CC="mpicc" \
+FC="mpif90" \
+F9X="mpif90" \
+RUNPARALLEL="mpirun" \
+OMPI_MCA_disable_memory_allocator=1 \
+--prefix=/usr \
+--docdir=/usr/share/doc/hdf5/ \
+--enable-static \
+--disable-sharedlib-rpath \
+--enable-build-mode=production \
+--enable-hl \
+--enable-cxx \
+--enable-fortran \
+--enable-parallel \
+--enable-unsupported \
+--with-pic \
+--with-zlib \
+--with-szlib
+make
 }
 
 check() {
-cd build
-# Three expected test failures 
(https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.3/src/hdf5-1.10.3-RELEASE.txt,
 Known Problems):
-#   142 - TEST_PAR_testphdf5 (Failed)
-#   146 - TEST_PAR_t_cache_image (Timeout)
-#   153 - TEST_PAR_t_shapesame (Failed)
-ctest . -C Release || warning "Tests failed"
+cd ${_pkgname}-${pkgver/_/-}
+# Without this, checks are failing with messages like “error while loading 
shared libraries: libhdf5.so.101: cannot open shared object file: No such file 
or directory”
+export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
+# This is a parallel build, they are always OpenMPI bugs
+make check || warning "Tests failed"
 }
 
 package() {
-cd build
+cd ${_pkgname}-${pkgver/_/-}
 
 make DESTDIR="${pkgdir}" install
 
-install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
-rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
+# Remove leftover test files
+rm "${pkgdir}"/usr/include/tst{ds,image,lite,table}{,_tests}.mod
+
+# Move examples to a proper place
+install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
+
+install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgname}
+
+# Install pkg-config files from CMake tree
+install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t 
"${pkgdir}"/usr/lib/pkgconfig/
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-08-24 Thread Bruno Pagani via arch-commits 
Date: Friday, August 24, 2018 @ 10:35:31
  Author: archange
Revision: 373668

Keep static libs correctly

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-24 10:34:09 UTC (rev 373667)
+++ PKGBUILD2018-08-24 10:35:31 UTC (rev 373668)
@@ -21,6 +21,7 @@
 provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5')
 replaces=("hdf5-fortran-${_mpi}")
+options=('staticlibs')
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
 'mpi.patch')
 md5sums=('56c5039103c51a40e493b43c504ce982'

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-08-23 Thread Bruno Pagani via arch-commits 
Date: Thursday, August 23, 2018 @ 20:42:22
  Author: archange
Revision: 373479

upgpkg: hdf5-openmpi 1.10.3-1

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   84 +++--
 1 file changed, 38 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-23 20:36:20 UTC (rev 373478)
+++ PKGBUILD2018-08-23 20:42:22 UTC (rev 373479)
@@ -10,78 +10,70 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.2
-pkgrel=2
+pkgver=1.10.3
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
-url="https://www.hdfgroup.org/HDF5/;
+url="https://www.hdfgroup.org/hdf5;
 license=('custom')
 depends=('zlib' 'libaec' 'bash' 'openmpi')
-makedepends=('time' 'gcc-fortran')
+makedepends=('cmake' 'time' 'gcc-fortran')
 provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5')
 replaces=("hdf5-fortran-${_mpi}")
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
 'mpi.patch')
-md5sums=('41fb9347801b546fba323523a1c1af51'
+md5sums=('56c5039103c51a40e493b43c504ce982'
  'dfa8dd50b8a7ebb3ad7249c627156cf9')
-sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71'
+sha256sums=('c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9'
 '603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {
+mkdir -p build
+
 cd ${_pkgname}-${pkgver/_/-}
-# Fix building with GCC 8.1
-sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
-
 # FS#33343
 patch -p1 -i ../mpi.patch
 }
 
 build() {
-cd ${_pkgname}-${pkgver/_/-}
-./configure \
-CXX="mpicxx" \
-CC="mpicc" \
-FC="mpif90" \
-F9X="mpif90" \
-RUNPARALLEL="mpirun" \
-OMPI_MCA_disable_memory_allocator=1 \
---prefix=/usr \
---docdir=/usr/share/doc/hdf5/ \
---disable-static \
---disable-sharedlib-rpath \
---enable-build-mode=production \
---enable-hl \
---enable-cxx \
---enable-fortran \
---enable-parallel \
---enable-unsupported \
---with-pic \
---with-zlib \
---with-szlib
-make
+cd build
+CXX="mpicxx" \
+CC="mpicc" \
+FC="mpif90" \
+F9X="mpif90" \
+RUNPARALLEL="mpirun" \
+OMPI_MCA_disable_memory_allocator=1 \
+cmake ../${_pkgname}-${pkgver/_/-} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_SHARED_LIBS=ON \
+-DCMAKE_BUILD_TYPE=Release \
+-DALLOW_UNSUPPORTED=ON \
+-DHDF5_BUILD_HL_LIB=ON \
+-DHDF5_BUILD_CPP_LIB=ON \
+-DHDF5_BUILD_FORTRAN=ON \
+-DHDF5_ENABLE_PARALLEL=ON \
+-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_ENCODING=ON
+cmake --build . --config Release
 }
 
 check() {
-cd ${_pkgname}-${pkgver/_/-}
-# Without this, checks are failing with messages like “error while loading 
shared libraries: libhdf5.so.101: cannot open shared object file: No such file 
or directory”
-export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
-# This is a parallel build, they are always OpenMPI bugs
-make check || warning "Tests failed"
+cd build
+# Three expected test failures 
(https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.3/src/hdf5-1.10.3-RELEASE.txt,
 Known Problems):
+#   142 - TEST_PAR_testphdf5 (Failed)
+#   146 - TEST_PAR_t_cache_image (Timeout)
+#   153 - TEST_PAR_t_shapesame (Failed)
+ctest . -C Release || warning "Tests failed"
 }
 
 package() {
-cd ${_pkgname}-${pkgver/_/-}
+cd build
 
 make DESTDIR="${pkgdir}" install
 
-install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
-
-install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-05-23 Thread Bruno Pagani via arch-commits 
Date: Wednesday, May 23, 2018 @ 14:55:46
  Author: archange
Revision: 328321

upgpkg: hdf5-openmpi 1.10.2-2

Same as hdf5

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   33 +
 1 file changed, 21 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-23 14:22:20 UTC (rev 328320)
+++ PKGBUILD2018-05-23 14:55:46 UTC (rev 328321)
@@ -10,8 +10,8 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.1
-pkgrel=4
+pkgver=1.10.2
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/HDF5/;
@@ -23,11 +23,15 @@
 replaces=("hdf5-fortran-${_mpi}")
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
 'mpi.patch')
-md5sums=('d89893c05ee7ea8611b51bb39450d64e'
+md5sums=('41fb9347801b546fba323523a1c1af51'
  'dfa8dd50b8a7ebb3ad7249c627156cf9')
+sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71'
+'603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {
 cd ${_pkgname}-${pkgver/_/-}
+# Fix building with GCC 8.1
+sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
 
 # FS#33343
 patch -p1 -i ../mpi.patch
@@ -58,11 +62,18 @@
 make
 }
 
-# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
-#check() {
-#cd ${pkgname}-${pkgver/_/-}
-#make check
-#}
+check() {
+cd ${_pkgname}-${pkgver/_/-}
+# Without this, checks are failing with messages like “error while loading 
shared libraries: libhdf5.so.101: cannot open shared object file: No such file 
or directory”
+export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
+# This is a parallel build, they are always OpenMPI bugs
+make check || warning "Tests failed"
+}
 
 package() {
 cd ${_pkgname}-${pkgver/_/-}
@@ -69,10 +80,8 @@
 
 make DESTDIR="${pkgdir}" install
 
-rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
 
-install -dm755 "${pkgdir}"/usr/share/${_pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
-
 install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-05-03 Thread Bruno Pagani via arch-commits 
Date: Thursday, May 3, 2018 @ 09:01:24
  Author: archange
Revision: 318815

GCC 8.1 rebuild

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   79 ++---
 1 file changed, 39 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-03 07:33:55 UTC (rev 318814)
+++ PKGBUILD2018-05-03 09:01:24 UTC (rev 318815)
@@ -10,70 +10,69 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.2
-pkgrel=1
+pkgver=1.10.1
+pkgrel=4
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/HDF5/;
 license=('custom')
 depends=('zlib' 'libaec' 'bash' 'openmpi')
-makedepends=('cmake' 'time' 'gcc-fortran')
+makedepends=('time' 'gcc-fortran')
 provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5')
 replaces=("hdf5-fortran-${_mpi}")
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
 'mpi.patch')
-md5sums=('41fb9347801b546fba323523a1c1af51'
+md5sums=('d89893c05ee7ea8611b51bb39450d64e'
  'dfa8dd50b8a7ebb3ad7249c627156cf9')
-sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71'
-'603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {
-mkdir -p build
+cd ${_pkgname}-${pkgver/_/-}
 
-cd ${_pkgname}-${pkgver/_/-}
 # FS#33343
 patch -p1 -i ../mpi.patch
 }
 
 build() {
-cd build
-CXX="mpicxx" \
-CC="mpicc" \
-FC="mpif90" \
-F9X="mpif90" \
-RUNPARALLEL="mpirun" \
-OMPI_MCA_disable_memory_allocator=1 \
-cmake ../${_pkgname}-${pkgver/_/-} \
--DCMAKE_INSTALL_PREFIX=/usr \
--DBUILD_SHARED_LIBS=ON \
--DCMAKE_BUILD_TYPE=Release \
--DALLOW_UNSUPPORTED=ON \
--DHDF5_BUILD_HL_LIB=ON \
--DHDF5_BUILD_CPP_LIB=ON \
--DHDF5_BUILD_FORTRAN=ON \
--DHDF5_ENABLE_PARALLEL=ON \
--DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
--DHDF5_ENABLE_SZIP_SUPPORT=ON \
--DHDF5_ENABLE_SZIP_ENCODING=ON
-cmake --build . --config Release
+cd ${_pkgname}-${pkgver/_/-}
+./configure \
+CXX="mpicxx" \
+CC="mpicc" \
+FC="mpif90" \
+F9X="mpif90" \
+RUNPARALLEL="mpirun" \
+OMPI_MCA_disable_memory_allocator=1 \
+--prefix=/usr \
+--docdir=/usr/share/doc/hdf5/ \
+--disable-static \
+--disable-sharedlib-rpath \
+--enable-build-mode=production \
+--enable-hl \
+--enable-cxx \
+--enable-fortran \
+--enable-parallel \
+--enable-unsupported \
+--with-pic \
+--with-zlib \
+--with-szlib
+make
 }
 
-check() {
-cd build
-# Three expected test failures 
(https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.2/src/hdf5-1.10.2-RELEASE.txt,
 Known Problems):
-#   142 - TEST_PAR_testphdf5 (Failed)
-#   146 - TEST_PAR_t_cache_image (Timeout)
-#   153 - TEST_PAR_t_shapesame (Failed)
-ctest . -C Release || warning "Tests failed"
-}
+# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
+#check() {
+#cd ${pkgname}-${pkgver/_/-}
+#make check
+#}
 
 package() {
-cd build
+cd ${_pkgname}-${pkgver/_/-}
 
 make DESTDIR="${pkgdir}" install
 
-install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
-rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
+rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+
+install -dm755 "${pkgdir}"/usr/share/${_pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
+
+install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-04-05 Thread Bruno Pagani via arch-commits 
Date: Thursday, April 5, 2018 @ 14:53:22
  Author: archange
Revision: 314436

upgpkg: hdf5-openmpi 1.10.2-1

Switch to CMake, which now provides pkg-config and thus fixing FS#56370.

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   79 ++---
 1 file changed, 40 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-05 14:53:14 UTC (rev 314435)
+++ PKGBUILD2018-04-05 14:53:22 UTC (rev 314436)
@@ -10,69 +10,70 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.1
-pkgrel=3
+pkgver=1.10.2
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/HDF5/;
 license=('custom')
 depends=('zlib' 'libaec' 'bash' 'openmpi')
-makedepends=('time' 'gcc-fortran')
+makedepends=('cmake' 'time' 'gcc-fortran')
 provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5')
 replaces=("hdf5-fortran-${_mpi}")
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
 'mpi.patch')
-md5sums=('d89893c05ee7ea8611b51bb39450d64e'
+md5sums=('41fb9347801b546fba323523a1c1af51'
  'dfa8dd50b8a7ebb3ad7249c627156cf9')
+sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71'
+'603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
 
 prepare() {
+mkdir -p build
+
 cd ${_pkgname}-${pkgver/_/-}
-
 # FS#33343
 patch -p1 -i ../mpi.patch
 }
 
 build() {
-cd ${_pkgname}-${pkgver/_/-}
-./configure \
-CXX="mpicxx" \
-CC="mpicc" \
-FC="mpif90" \
-F9X="mpif90" \
-RUNPARALLEL="mpirun" \
-OMPI_MCA_disable_memory_allocator=1 \
---prefix=/usr \
---docdir=/usr/share/doc/hdf5/ \
---disable-static \
---disable-sharedlib-rpath \
---enable-build-mode=production \
---enable-hl \
---enable-cxx \
---enable-fortran \
---enable-parallel \
---enable-unsupported \
---with-pic \
---with-zlib \
---with-szlib
-make
+cd build
+CXX="mpicxx" \
+CC="mpicc" \
+FC="mpif90" \
+F9X="mpif90" \
+RUNPARALLEL="mpirun" \
+OMPI_MCA_disable_memory_allocator=1 \
+cmake ../${_pkgname}-${pkgver/_/-} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_SHARED_LIBS=ON \
+-DCMAKE_BUILD_TYPE=Release \
+-DALLOW_UNSUPPORTED=ON \
+-DHDF5_BUILD_HL_LIB=ON \
+-DHDF5_BUILD_CPP_LIB=ON \
+-DHDF5_BUILD_FORTRAN=ON \
+-DHDF5_ENABLE_PARALLEL=ON \
+-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_ENCODING=ON
+cmake --build . --config Release
 }
 
-# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
-#check() {
-#cd ${pkgname}-${pkgver/_/-}
-#make check
-#}
+check() {
+cd build
+# Three expected test failures 
(https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.2/src/hdf5-1.10.2-RELEASE.txt,
 Known Problems):
+#   142 - TEST_PAR_testphdf5 (Failed)
+#   146 - TEST_PAR_t_cache_image (Timeout)
+#   153 - TEST_PAR_t_shapesame (Failed)
+ctest . -C Release || warning "Tests failed"
+}
 
 package() {
-cd ${_pkgname}-${pkgver/_/-}
+cd build
 
 make DESTDIR="${pkgdir}" install
 
-rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
-
-install -dm755 "${pkgdir}"/usr/share/${_pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
-
-install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2018-01-17 Thread Bruno Pagani via arch-commits 
Date: Wednesday, January 17, 2018 @ 13:56:39
  Author: archange
Revision: 283670

Enable SZip support via libaec

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-17 13:50:46 UTC (rev 283669)
+++ PKGBUILD2018-01-17 13:56:39 UTC (rev 283670)
@@ -1,6 +1,6 @@
 # $Id$
 # Maintainer: Ronald van Haren 
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) 
+# Maintainer: Bruno Pagani 
 # Contributor: Stefan Husmann 
 # Contributor: damir 
 # Contributor: Tom K 
@@ -11,12 +11,12 @@
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
 pkgver=1.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/HDF5/;
 license=('custom')
-depends=('zlib' 'bash' 'openmpi')
+depends=('zlib' 'libaec' 'bash' 'openmpi')
 makedepends=('time' 'gcc-fortran')
 provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5')
@@ -43,24 +43,31 @@
 RUNPARALLEL="mpirun" \
 OMPI_MCA_disable_memory_allocator=1 \
 --prefix=/usr \
+--docdir=/usr/share/doc/hdf5/ \
 --disable-static \
+--disable-sharedlib-rpath \
+--enable-build-mode=production \
 --enable-hl \
---enable-build-mode=production \
---with-pic \
---docdir=/usr/share/doc/hdf5/ \
---disable-sharedlib-rpath \
 --enable-cxx \
 --enable-fortran \
 --enable-parallel \
 --enable-unsupported \
---with-zlib
+--with-pic \
+--with-zlib \
+--with-szlib
 make
 }
 
+# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
+#check() {
+#cd ${pkgname}-${pkgver/_/-}
+#make check
+#}
+
 package() {
 cd ${_pkgname}-${pkgver/_/-}
 
-make -j1 DESTDIR="${pkgdir}" install
+make DESTDIR="${pkgdir}" install
 
 rm -rf "${pkgdir}"/usr/lib/libdynlib*.so

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2017-12-20 Thread Bruno Pagani via arch-commits 
Date: Wednesday, December 20, 2017 @ 14:58:43
  Author: archange
Revision: 275026

OpenMPI 3.0 rebuild

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-20 14:58:24 UTC (rev 275025)
+++ PKGBUILD2017-12-20 14:58:43 UTC (rev 275026)
@@ -11,7 +11,7 @@
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/HDF5/;

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD hdf51.10-CVE2016.patch)

2017-06-17 Thread Bruno Pagani 
Date: Saturday, June 17, 2017 @ 14:57:15
  Author: archange
Revision: 237925

upgpkg: hdf5-openmpi 1.10.1-1

Remove CVE patch, fixed upstream in this release.

Modified:
  hdf5-openmpi/trunk/PKGBUILD
Deleted:
  hdf5-openmpi/trunk/hdf51.10-CVE2016.patch

+
 PKGBUILD   |   16 +-
 hdf51.10-CVE2016.patch |  280 ---
 2 files changed, 7 insertions(+), 289 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 14:57:14 UTC (rev 237924)
+++ PKGBUILD2017-06-17 14:57:15 UTC (rev 237925)
@@ -10,9 +10,8 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-_patch=patch1
-pkgver=1.10.0_${_patch}
-pkgrel=3
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('i686' 'x86_64')
 url="https://www.hdfgroup.org/HDF5/;
@@ -23,16 +22,13 @@
 conflicts=('hdf5')
 replaces=("hdf5-fortran-${_mpi}")
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
-'mpi.patch'
-'hdf51.10-CVE2016.patch')
-md5sums=('f6d980febe2c35c11670a9b34fa3b487'
- 'dfa8dd50b8a7ebb3ad7249c627156cf9'
- 'ebc0db3fe6d55dc39f63143ebb6327d4')
+'mpi.patch')
+md5sums=('d89893c05ee7ea8611b51bb39450d64e'
+ 'dfa8dd50b8a7ebb3ad7249c627156cf9')
 
 prepare() {
 cd ${_pkgname}-${pkgver/_/-}
 
-patch -p0 -i ../hdf51.10-CVE2016.patch
 # FS#33343
 patch -p1 -i ../mpi.patch
 }
@@ -66,6 +62,8 @@
 
 make -j1 DESTDIR="${pkgdir}" install
 
+rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+
 install -dm755 "${pkgdir}"/usr/share/${_pkgname}
 mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
 

Deleted: hdf51.10-CVE2016.patch
===
--- hdf51.10-CVE2016.patch  2017-06-17 14:57:14 UTC (rev 237924)
+++ hdf51.10-CVE2016.patch  2017-06-17 14:57:15 UTC (rev 237925)
@@ -1,280 +0,0 @@
-diff --git src/H5Ocache.c src/H5Ocache.c
-index 831b08a..eab0fd2 100644
 src/H5Ocache.c
-+++ src/H5Ocache.c
-@@ -1433,6 +1433,10 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t 
len, const uint8_t *image
- HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination 
for message")
- if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & 
H5O_MSG_FLAG_MARK_IF_UNKNOWN))
- HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination 
for message")
-+if((flags & H5O_MSG_FLAG_SHAREABLE)
-+&& H5O_msg_class_g[id]
-+&& !(H5O_msg_class_g[id]->share_flags & 
H5O_SHARE_IS_SHARABLE))
-+HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message of unsharable 
class flagged as sharable")
- 
- /* Reserved bytes/creation index */
- if(oh->version == H5O_VERSION_1)
-diff --git src/H5Odtype.c src/H5Odtype.c
-index e51d319..799f475 100644
 src/H5Odtype.c
-+++ src/H5Odtype.c
-@@ -311,7 +311,11 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned 
*ioflags/*in,out*/, const uint8_t **p
- if(version == H5O_DTYPE_VERSION_1) {
- /* Decode the number of dimensions */
- ndims = *(*pp)++;
--HDassert(ndims <= 4);
-+
-+/* Check that ndims is valid */
-+if(ndims > 4)
-+HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, 
"invalid number of dimensions for array")
-+
- *pp += 3; /*reserved bytes */
- 
- /* Skip dimension permutation */
-@@ -519,7 +523,8 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned 
*ioflags/*in,out*/, const uint8_t **p
- dt->shared->u.array.ndims = *(*pp)++;
- 
- /* Double-check the number of dimensions */
--HDassert(dt->shared->u.array.ndims <= H5S_MAX_RANK);
-+if(dt->shared->u.array.ndims > H5S_MAX_RANK)
-+HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "too many 
dimensions for array datatype")
- 
- /* Skip reserved bytes, if version has them */
- if(version < H5O_DTYPE_VERSION_3)
-diff --git src/H5Opkg.h src/H5Opkg.h
-index 7473397..0fefa21 100644
 src/H5Opkg.h
-+++ src/H5Opkg.h
-@@ -212,6 +212,7 @@
-   
\
- /* Set the message's "shared info", if it's shareable */\
- if((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) {   
\
-+HDassert(msg_type->share_flags & H5O_SHARE_IS_SHARABLE);  
\
- H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, 
H5O_SHARE_TYPE_HERE, (F), msg_type->id, (MSG)->crt_idx, (OH)->chunk[0].addr) \
- } /* end if */

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD hdf51.10-CVE2016.patch)

2017-06-17 Thread Bruno Pagani 
Date: Saturday, June 17, 2017 @ 13:39:09
  Author: archange
Revision: 237876

Fix several CVEs, add Fortran bindings

The following CVE are fixed in this release:
   CVE-2016-4330:  HDF5 bug  HDFFV-9992 (TALOS-2016-176)
   CVE-2016-4331:  HDF5 bug  HDFFV-9951 (TALOS-2016-177)
   CVE-2016-4332:  HDF5 bug  HDFFV-9950 (TALOS-2016-178)
   CVE-2016-4333:  HDF5 bug  HDFFV-9993 (TALOS-2016-179)

Fortran bindings are added (no incompatibilities at all).

Some cleaning

Added:
  hdf5-openmpi/trunk/hdf51.10-CVE2016.patch
Modified:
  hdf5-openmpi/trunk/PKGBUILD

+
 PKGBUILD   |   96 
 hdf51.10-CVE2016.patch |  280 +++
 2 files changed, 331 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 13:11:21 UTC (rev 237875)
+++ PKGBUILD2017-06-17 13:39:09 UTC (rev 237876)
@@ -1,5 +1,6 @@
 # $Id$
 # Maintainer: Ronald van Haren 
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) 
 # Contributor: Stefan Husmann 
 # Contributor: damir 
 # Contributor: Tom K 
@@ -6,62 +7,67 @@
 # Contributor: Jed Brown 
 # Contributor: Simone Pezzuto 
 
-pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.10.0_patch1
-_pkgver=1.10.0-patch1
-pkgrel=2
+_mpi=openmpi
+pkgname=${_pkgname}-${_mpi}
+_patch=patch1
+pkgver=1.10.0_${_patch}
+pkgrel=3
+pkgdesc="General purpose library and file format for storing scientific data 
(${_mpi} version)"
 arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data 
(OpenMPI version)"
-url="http://www.hdfgroup.org/HDF5/;
+url="https://www.hdfgroup.org/HDF5/;
 license=('custom')
-depends=('zlib' 'sh' 'openmpi')
-makedepends=('time')
-provides=('hdf5')
+depends=('zlib' 'bash' 'openmpi')
+makedepends=('time' 'gcc-fortran')
+provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${_pkgver}/src/${_pkgname}-${_pkgver}.tar.bz2
-mpi.patch)
-sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4'
-  '658d4a3e537c9c76da3200effa8f95b656a21936')
+replaces=("hdf5-fortran-${_mpi}")
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2;
+'mpi.patch'
+'hdf51.10-CVE2016.patch')
+md5sums=('f6d980febe2c35c11670a9b34fa3b487'
+ 'dfa8dd50b8a7ebb3ad7249c627156cf9'
+ 'ebc0db3fe6d55dc39f63143ebb6327d4')
 
-build() {
-  cd "$srcdir/${_pkgname}-${pkgver/_/-}"
+prepare() {
+cd ${_pkgname}-${pkgver/_/-}
 
-  # FS#33343
-  patch -Np1 -i "${srcdir}/mpi.patch"
+patch -p0 -i ../hdf51.10-CVE2016.patch
+# FS#33343
+patch -p1 -i ../mpi.patch
+}
 
-  ./configure \
-CXX="mpicxx" \
-CC="mpicc" \
-FC="mpif90" \
-F9X="mpif90" \
-RUNPARALLEL="mpirun" \
-OMPI_MCA_disable_memory_allocator=1 \
---prefix=/usr \
---with-pthread=/usr/lib/ \
---enable-linux-lfs \
---enable-unsupported \
---enable-shared \
---disable-static \
---enable-build-mode=production \
---with-zlib \
---enable-parallel=yes \
---enable-cxx \
---disable-sharedlib-rpath
-
-  make
+build() {
+cd ${_pkgname}-${pkgver/_/-}
+./configure \
+CXX="mpicxx" \
+CC="mpicc" \
+FC="mpif90" \
+F9X="mpif90" \
+RUNPARALLEL="mpirun" \
+OMPI_MCA_disable_memory_allocator=1 \
+--prefix=/usr \
+--disable-static \
+--enable-hl \
+--enable-build-mode=production \
+--with-pic \
+--docdir=/usr/share/doc/hdf5/ \
+--disable-sharedlib-rpath \
+--enable-cxx \
+--enable-fortran \
+--enable-parallel \
+--enable-unsupported \
+--with-zlib
+make
 }
 
 package() {
-  cd "$srcdir/${_pkgname}-${pkgver/_/-}"
+cd ${_pkgname}-${pkgver/_/-}
 
-  make -j1 DESTDIR="${pkgdir}" install
+make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 "$pkgdir/usr/share/$_pkgname"
-  mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples}
+install -dm755 "${pkgdir}"/usr/share/${_pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
 
-  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
-  install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
-  "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
+install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
 }
-

Added: hdf51.10-CVE2016.patch
===
--- hdf51.10-CVE2016.patch  (rev 0)
+++ hdf51.10-CVE2016.patch  2017-06-17 13:39:09 UTC (rev 237876)
@@ -0,0 +1,280 @@
+diff --git src/H5Ocache.c src/H5Ocache.c

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2017-06-14 Thread Anatol Pomozov 
Date: Wednesday, June 14, 2017 @ 07:12:02
  Author: anatolik
Revision: 236716

upgpkg: hdf5-openmpi 1.10.0_patch1-2

openmpi 2.x rebuild

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-14 07:09:11 UTC (rev 236715)
+++ PKGBUILD2017-06-14 07:12:02 UTC (rev 236716)
@@ -10,7 +10,7 @@
 _pkgname=hdf5
 pkgver=1.10.0_patch1
 _pkgver=1.10.0-patch1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data 
(OpenMPI version)"
 url="http://www.hdfgroup.org/HDF5/;

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2016-09-06 Thread Ronald van Haren 
Date: Tuesday, September 6, 2016 @ 07:59:18
  Author: ronald
Revision: 275786

upgpkg: hdf5-openmpi 1.10.0_patch1-1

update to 1.10.0-patch1

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-06 07:49:35 UTC (rev 275785)
+++ PKGBUILD2016-09-06 07:59:18 UTC (rev 275786)
@@ -8,7 +8,8 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.10.0
+pkgver=1.10.0_patch1
+_pkgver=1.10.0-patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data 
(OpenMPI version)"
@@ -18,9 +19,9 @@
 makedepends=('time')
 provides=('hdf5')
 conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2
+source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${_pkgver}/src/${_pkgname}-${_pkgver}.tar.bz2
 mpi.patch)
-sha1sums=('5866dbbcd24485f6b206413e73f7205cb3c1196e'
+sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4'
   '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2015-12-06 Thread Antonio Rojas 
Date: Monday, December 7, 2015 @ 03:11:54
  Author: arojas
Revision: 253161

C++11 ABI rebuild

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 02:01:25 UTC (rev 253160)
+++ PKGBUILD2015-12-07 02:11:54 UTC (rev 253161)
@@ -9,7 +9,7 @@
 pkgname=hdf5-openmpi
 _pkgname=hdf5
 pkgver=1.8.15_patch1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data 
(OpenMPI version)"
 url="http://www.hdfgroup.org/HDF5/;

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2015-10-27 Thread Anatol Pomozov 
Date: Wednesday, October 28, 2015 @ 02:11:48
  Author: anatolik
Revision: 249817

upgpkg: hdf5-openmpi 1.8.15_patch1-1

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-28 01:05:48 UTC (rev 249816)
+++ PKGBUILD2015-10-28 01:11:48 UTC (rev 249817)
@@ -8,8 +8,8 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.14
-pkgrel=2
+pkgver=1.8.15_patch1
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data 
(OpenMPI version)"
 url="http://www.hdfgroup.org/HDF5/;
@@ -20,7 +20,7 @@
 conflicts=('hdf5')
 
source=(http://www.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
 mpi.patch) 
-sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a'
+sha1sums=('82ed248e5d0293bc1dba4c13c9b2880a26643ee0'
   '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
@@ -29,8 +29,6 @@
   # FS#33343
   patch -Np1 -i "${srcdir}/mpi.patch"
 
-  export CFLAGS="${CFLAGS/O2/O0}"
-  export CXXFLAGS="${CFLAGS}"
   ./configure \
 CXX="mpicxx" \
 CC="mpicc" \

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2015-08-27 Thread Anatol Pomozov 
Date: Thursday, August 27, 2015 @ 22:23:56
  Author: anatolik
Revision: 244932

upgpkg: hdf5-openmpi 1.8.14-2

Rebuild for openmpi 1.10.0

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-27 17:23:33 UTC (rev 244931)
+++ PKGBUILD2015-08-27 20:23:56 UTC (rev 244932)
@@ -9,7 +9,7 @@
 pkgname=hdf5-openmpi
 _pkgname=hdf5
 pkgver=1.8.14
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data 
(OpenMPI version)
 url=http://www.hdfgroup.org/HDF5/;

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2015-05-30 Thread Antonio Rojas 
Date: Saturday, May 30, 2015 @ 20:41:11
  Author: arojas
Revision: 239949

Fix source URL

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 18:38:11 UTC (rev 239948)
+++ PKGBUILD2015-05-30 18:41:11 UTC (rev 239949)
@@ -18,7 +18,7 @@
 makedepends=('time')
 provides=('hdf5')
 conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
+source=(http://www.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
 mpi.patch) 
 sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a'
   '658d4a3e537c9c76da3200effa8f95b656a21936')

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2014-11-24 Thread Felix Yan 
Date: Monday, November 24, 2014 @ 17:08:08
  Author: fyan
Revision: 227055

upgpkg: hdf5-openmpi 1.8.14-1

upstream new release

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-24 16:07:58 UTC (rev 227054)
+++ PKGBUILD2014-11-24 16:08:08 UTC (rev 227055)
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.13
+pkgver=1.8.14
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data 
(OpenMPI version)
@@ -20,7 +20,7 @@
 conflicts=('hdf5')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
 mpi.patch) 
-sha1sums=('712955025f03db808f000d8f4976b8df0c0d37b5'
+sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a'
   '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2014-09-20 Thread Bartłomiej Piotrowski 
Date: Saturday, September 20, 2014 @ 11:08:45
  Author: bpiotrowski
Revision: 222161

upgpkg: hdf5-openmpi 1.8.13-1

new upstream release

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-20 09:06:18 UTC (rev 222160)
+++ PKGBUILD2014-09-20 09:08:45 UTC (rev 222161)
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.12
+pkgver=1.8.13
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data 
(OpenMPI version)
@@ -20,7 +20,7 @@
 conflicts=('hdf5')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
 mpi.patch) 
-sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f'
+sha1sums=('712955025f03db808f000d8f4976b8df0c0d37b5'
   '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2014-01-31 Thread Ronald van Haren 
Date: Friday, January 31, 2014 @ 10:05:22
  Author: ronald
Revision: 204907

upgpkg: hdf5-openmpi 1.8.12-1

update to 1.8.12

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-31 08:49:12 UTC (rev 204906)
+++ PKGBUILD2014-01-31 09:05:22 UTC (rev 204907)
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data 
(OpenMPI version)
@@ -20,14 +20,14 @@
 conflicts=('hdf5')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
 mpi.patch) 
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e'
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f'
   '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
+  cd $srcdir/${_pkgname}-${pkgver/_/-}
 
   # FS#33343
-  patch -Np1 -i ${srcdir}/mpi.patch
+  patch -Np1 -i ${srcdir}/mpi.patch
 
   export CFLAGS=${CFLAGS/O2/O0}
   export CXXFLAGS=${CFLAGS}
@@ -55,15 +55,15 @@
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
+  cd $srcdir/${_pkgname}-${pkgver/_/-}
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR=${pkgdir} install
 
-  install -d -m755 $pkgdir/usr/share/$_pkgname
-  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
+  install -d -m755 $pkgdir/usr/share/$_pkgname
+  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
-  $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
+  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
+  $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
 }

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2013-09-11 Thread Bartłomiej Piotrowski 
Date: Wednesday, September 11, 2013 @ 10:21:34
  Author: bpiotrowski
Revision: 194242

upgpkg: hdf5-openmpi 1.8.11-1

- new upstream release

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-11 08:21:21 UTC (rev 194241)
+++ PKGBUILD2013-09-11 08:21:34 UTC (rev 194242)
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.10_patch1
+pkgver=1.8.11
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data 
(OpenMPI version)
@@ -21,7 +21,7 @@
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
 mpi.patch) 
 options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e'
   '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD mpi.patch)

2013-05-11 Thread Ronald van Haren 
Date: Saturday, May 11, 2013 @ 10:51:45
  Author: ronald
Revision: 185113

upgpkg: hdf5-openmpi 1.8.10_patch1-1

update to 1.8.10_patch1; FS#33343 include mpi header

Added:
  hdf5-openmpi/trunk/mpi.patch
Modified:
  hdf5-openmpi/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +---
 mpi.patch |   18 ++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-11 08:31:06 UTC (rev 185112)
+++ PKGBUILD2013-05-11 08:51:45 UTC (rev 185113)
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.10
+pkgver=1.8.10_patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data 
(OpenMPI version)
@@ -18,12 +18,18 @@
 makedepends=('time')
 provides=('hdf5')
 conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2
 
+mpi.patch) 
 options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+  '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver/_/-}
+
+  # FS#33343
+  patch -Np1 -i ${srcdir}/mpi.patch
+
   export CFLAGS=${CFLAGS/O2/O0}
   export CXXFLAGS=${CFLAGS}
   ./configure \

Added: mpi.patch
===
--- mpi.patch   (rev 0)
+++ mpi.patch   2013-05-11 08:51:45 UTC (rev 185113)
@@ -0,0 +1,18 @@
+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
+@@ -58,6 +58,8 @@
+ #   include stddef.h
+ #endif
+ #ifdef H5_HAVE_PARALLEL
++#   define OMPI_SKIP_MPICXX   /* Make sure that cxx specific headers are not 
included */
++#   define MPICH_SKIP_MPICXX
+ #   include mpi.h
+ #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already   */
+ #   include mpio.h
+

[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

2013-01-07 Thread Ronald van Haren 
Date: Monday, January 7, 2013 @ 15:55:56
  Author: ronald
Revision: 174846

upgpkg: hdf5-openmpi 1.8.10-1

add hdf5 openmpi version FS#28581

Modified:
  hdf5-openmpi/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-07 20:41:14 UTC (rev 174845)
+++ PKGBUILD2013-01-07 20:55:56 UTC (rev 174846)
@@ -17,7 +17,7 @@
 depends=('zlib' 'sh' 'openmpi')
 makedepends=('time')
 provides=('hdf5')
-conficts=('hdf5')
+conflicts=('hdf5')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
 sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
@@ -57,8 +57,8 @@
   install -d -m755 $pkgdir/usr/share/$_pkgname
   mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
 
-  install -d -m755 $pkgdir/usr/share/licenses/${_pkgname}
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
   install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
-  $pkgdir/usr/share/licenses/${_pkgname}/LICENSE 
+  $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
 }