diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | FindXDR.patch | 21 | ||||
| -rw-r--r-- | PKGBUILD | 28 |
3 files changed, 44 insertions, 10 deletions
@@ -1,16 +1,17 @@ pkgbase = hdf-java pkgdesc = The hdf5 Java Native Interfaces (JNI) for 32-bit object ids (files created with versions up to 1.8) pkgver = 3.3.2 - pkgrel = 3 + pkgrel = 4 url = https://support.hdfgroup.org/products/java/ - arch = i686 arch = x86_64 license = custom makedepends = java-environment makedepends = cmake makedepends = apache-ant source = http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-3.3.2/src/CMake-hdfjava-3.3.2.tar.gz + source = FindXDR.patch md5sums = 9fdbb55f2292092f0e6b46078109d54a + md5sums = 97b03ee821863fd80b4c50aa75c9d791 pkgname = hdf-java diff --git a/FindXDR.patch b/FindXDR.patch new file mode 100644 index 000000000000..198d7c33167d --- /dev/null +++ b/FindXDR.patch @@ -0,0 +1,21 @@ +diff --git a/hdf-4.2.13/config/cmake/FindXDR.cmake b/hdf-4.2.13/config/cmake/FindXDR.cmake +index 127e573..48a3945 100644 +--- a/hdf-4.2.13/config/cmake/FindXDR.cmake ++++ b/hdf-4.2.13/config/cmake/FindXDR.cmake +@@ -21,7 +21,7 @@ find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/t + set(XDR_INT_FOUND) + CHECK_FUNCTION_EXISTS(xdr_int XDR_INT_FOUND) + if (NOT XDR_INT_FOUND) +- foreach(lib nsl rpc tirpc) ++ foreach(lib tirpc) + ## Try to find the corresponding lib + set(XDR_INT_LIBRARY) + find_library(XDR_INT_LIBRARY ${lib}) +@@ -35,6 +35,7 @@ find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/t + set(XDR_INT_FOUND TRUE) + break() + endif() ++ unset(XDR_INT_LIBRARY CACHE) + endforeach() + endif() + @@ -3,29 +3,41 @@ pkgname=hdf-java _pkgname=${pkgname/-/} pkgver=3.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="The hdf5 Java Native Interfaces (JNI) for 32-bit object ids (files created with versions up to 1.8)" -arch=('i686' 'x86_64') +arch=('x86_64') url="https://support.hdfgroup.org/products/java/" license=('custom') makedepends=('java-environment' 'cmake' 'apache-ant') depends=() -source=("http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-${pkgver}/src/CMake-${pkgname/-/}-${pkgver}.tar.gz") -md5sums=('9fdbb55f2292092f0e6b46078109d54a') +source=("http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-${pkgver}/src/CMake-${_pkgname}-${pkgver}.tar.gz" + FindXDR.patch) +md5sums=('9fdbb55f2292092f0e6b46078109d54a' + '97b03ee821863fd80b4c50aa75c9d791') prepare() { - cd "CMake-${pkgname/-/}-${pkgver}" - sed -i "s;DCMAKE_INSTALL_PREFIX:PATH=\${INSTALLDIR};DCMAKE_INSTALL_PREFIX:PATH=/opt/${pkgname/-/}-${pkgver};" HDFJavaconfig.cmake + cd "CMake-${_pkgname}-${pkgver}" + + # change install prefix + sed -i "s;DCMAKE_INSTALL_PREFIX:PATH=\${INSTALLDIR};DCMAKE_INSTALL_PREFIX:PATH=/opt/${_pkgname}-${pkgver};" HDFJavaconfig.cmake + # fix reported issues about finding JNI (?) rm "${_pkgname}-${pkgver}/config/cmake/FindJNI.cmake" + + # fix FindXDR issue + tar -xf HDF4.tar.gz + rm HDF4.tar.gz + patch -p1 < "${srcdir}/FindXDR.patch" + tar -cf - hdf-4.2.13 | gzip -9 > HDF4.tar.gz + rm -r hdf-4.2.13 } build() { - cd "CMake-${pkgname/-/}-${pkgver}" + cd "CMake-${_pkgname}-${pkgver}" ./build-hdfjava-unix.sh } package() { - cd "CMake-${pkgname/-/}-${pkgver}/build" + cd "CMake-${_pkgname}-${pkgver}/build" make -j1 DESTDIR=${pkgdir} install } |