summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Diehl2020-12-16 05:22:24 +0100
committerMartin Diehl2020-12-16 06:07:39 +0100
commitb362a50ffd6cfcef4fbcd8405ec48f025b8ae3e0 (patch)
tree1b29e8555f067f43e38eab496ed8860738a4626b
parentb81b6f32fa3d174e9c91d91579f4b0b198710940 (diff)
downloadaur-b362a50ffd6cfcef4fbcd8405ec48f025b8ae3e0.tar.gz
adjusted to hdf5-openmpi, using indirect relations for depends/provides
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8617f12d22e3..8e74d70e6982 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = hdf5-openmpi-java
pkgdesc = General purpose library and file format for storing scientific data (openmpi version including Java Native Interfaces)
pkgver = 1.12.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.hdfgroup.org/hdf5
arch = x86_64
license = custom
@@ -13,14 +13,9 @@ pkgbase = hdf5-openmpi-java
depends = libaec
depends = bash
depends = openmpi
- provides = hdf5
- provides = hdf5-cpp-fortran
- provides = hdf5-fortran-openmpi
provides = hdf5-openmpi
provides = hdf5-java
conflicts = hdf5
- conflicts = hdf5-openmpi
- conflicts = hdf5-java
replaces = hdf5-fortran-openmpi
options = staticlibs
source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.0/src/hdf5-1.12.0.tar.bz2
diff --git a/PKGBUILD b/PKGBUILD
index 2d5bbf7c4fef..0f8a0b6a5c5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Martin Diehl <https://martin-diehl.net>
+# Maintainer: Martin Diehl <aur@martin-diehl.net>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Bruno Pagani <archange@archlinux.org>
# Contributor: George Eleftheriou <eleftg>
@@ -12,15 +12,15 @@ _pkgname=hdf5
_mpi=openmpi
pkgname=${_pkgname}-${_mpi}-java
pkgver=1.12.0
-pkgrel=1
+pkgrel=2
pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version including Java Native Interfaces)"
arch=(x86_64)
url="https://www.hdfgroup.org/hdf5"
license=(custom)
depends=(zlib libaec bash ${_mpi})
makedepends=(cmake time gcc-fortran java-environment)
-provides=(hdf5 hdf5-cpp-fortran hdf5-fortran-${_mpi} hdf5-${_mpi} hdf5-java)
-conflicts=(hdf5 hdf5-openmpi hdf5-java)
+provides=(hdf5-${_mpi} hdf5-java)
+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"
@@ -87,7 +87,7 @@ check() {
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"
+ make check || echo "Tests failed"
}
package() {