Updated: PKGBUILD

3 files changed, 27 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c248882aff35..6680e105e0f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-hdf5
 	pkgdesc = General purpose library and file format for storing scientific data (32-bit)
 	pkgver = 1.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://portal.hdfgroup.org/display/support
 	arch = x86_64
 	license = custom
@@ -11,10 +11,9 @@ pkgbase = lib32-hdf5
 	depends = lib32-zlib
 	depends = lib32-libaec
 	depends = bash
+	depends = hdf5
 	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
 	sha256sums = 97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61
-	sha256sums = 72ad497c56760bb3af8193c88d3fa264125829850b843697de55d934c56f7f44
 
 pkgname = lib32-hdf5
 
diff --git a/PKGBUILD b/PKGBUILD
index de7e79bd6ae3..83f75db24f59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,33 +6,17 @@
 _pkgname=hdf5
 pkgname=lib32-${_pkgname}
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data (32-bit)"
 arch=('x86_64')
 url="https://portal.hdfgroup.org/display/support"
 license=(custom)
-depends=(lib32-zlib lib32-libaec bash)
+depends=(lib32-zlib lib32-libaec bash hdf5)
 makedepends=(cmake time gcc-fortran-multilib)
-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')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61')
 
 build() {
-    # Crazy workaround: run CMake to generate pkg-config file
-    mkdir -p build && cd build
-    cmake ../${_pkgname}-${pkgver/_/-} \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DBUILD_SHARED_LIBS=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DHDF5_BUILD_HL_LIB=ON \
-        -DHDF5_BUILD_CPP_LIB=ON \
-        -DHDF5_BUILD_FORTRAN=ON \
-        -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
-        -DHDF5_ENABLE_SZIP_SUPPORT=ON \
-        -DHDF5_ENABLE_SZIP_ENCODING=ON
-    # But dont build with it, its quite broken
-
     cd ${srcdir}/${_pkgname}-${pkgver}
     ./configure \
         CFLAGS="-m32 ${CFLAGS}" \
@@ -43,9 +27,9 @@ build() {
         PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
         --prefix=/usr \
         --libdir=/usr/lib32 \
-        --docdir=/usr/share/doc/hdf5 \
         --disable-static \
         --disable-sharedlib-rpath \
+	--disable-tools \
         --enable-build-mode=production \
         --enable-hl \
         --enable-cxx \
@@ -58,23 +42,30 @@ build() {
 
 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/
+    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/
+    
     make check
 }
 
 package() {
-    cd ${_pkgname}-${pkgver/_/-}
+    cd ${srcdir}/${_pkgname}-${pkgver/_/-}/src
+    make DESTDIR="${pkgdir}" install
+    cd ../c++
     make DESTDIR="${pkgdir}" install
-    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
+    cd ../fortran
+    make DESTDIR="${pkgdir}" install       
+    cd ../hl
+    make DESTDIR="${pkgdir}" install       
+    
+    cd ${srcdir}/${_pkgname}-${pkgver/_/-}
+    
+    rm -rf "${pkgdir}"/usr/bin
+    rm -rf "${pkgdir}"/usr/include
 }
diff --git a/hdf5-1.12.0-compat-1.6.patch b/hdf5-1.12.0-compat-1.6.patch
deleted file mode 100644
index eda1919dc94b..000000000000
--- a/hdf5-1.12.0-compat-1.6.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- 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) */