Merge branch '78-cleanup-h5hut' into 'master'

Resolve "cleanup H5hut"

Closes #78

See merge request Pmodules/buildblocks!100
This commit is contained in:
2020-07-16 15:01:22 +02:00
5 changed files with 13 additions and 41 deletions

View File

@@ -1,25 +0,0 @@
H5hut/1.99.13 stable gcc/4.7.4 openmpi/1.6.5 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.7.4 openmpi/1.6.5 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.7.4 openmpi/1.8.2 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.7.4 openmpi/1.8.2 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.7.4 openmpi/1.8.4 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.7.4 openmpi/1.8.4 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.3 openmpi/1.6.5 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.8.3 openmpi/1.6.5 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.3 openmpi/1.8.2 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.8.3 openmpi/1.8.2 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.3 openmpi/1.8.4 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.8.3 openmpi/1.8.4 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.4 openmpi/1.6.5 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.8.4 openmpi/1.6.5 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.4 openmpi/1.8.2 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.8.4 openmpi/1.8.2 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.4 openmpi/1.8.4 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.8.4 openmpi/1.8.4 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.8.5 openmpi/1.8.8 hdf5/1.8.12 b:libtool b:autoconf b:automake
H5hut/1.99.13 stable gcc/4.9.2 openmpi/1.6.5 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.9.2 openmpi/1.6.5 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.9.2 openmpi/1.8.2 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.9.2 openmpi/1.8.2 hdf5/1.8.14
H5hut/1.99.13 stable gcc/4.9.2 openmpi/1.8.4 hdf5/1.8.12
H5hut/1.99.13 stable gcc/4.9.2 openmpi/1.8.4 hdf5/1.8.14

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env modbuild
pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-${V_PKG}.tar.gz"
pbuild::add_to_group 'HDF5'
pbuild::install_docfiles 'AUTHORS' 'COPYING'
@@ -8,32 +8,27 @@ if [[ ${V_MAJOR} == 1 ]]; then
pbuild::compile_in_sourcetree
fi
pbuild::pre_configure() {
: ./autogen.sh
pbuild::post_prep() {
./autogen.sh
}
pbuild::configure() {
pbuild::pre_configure() {
pbuild::add_configure_args "--enable-parallel"
pbuild::add_configure_args "--enable-debug"
pbuild::add_configure_args "--enable-shared"
pbuild::add_configure_args "--with-hdf5=$HDF5_PREFIX"
pbuild::add_configure_args "--with-pic"
if (( V_MAJOR >= 2 )); then
: config_args+=" --enable-python"
: pbuild::add_configure_args "--enable-python"
fi
case "${COMPILER}" in
"clang-macos" )
:
;;
* )
config_args+='--enable-fortran'
pbuild::add_configure_args '--enable-fortran'
;;
esac
"${SRC_DIR}"/configure \
--prefix="${PREFIX}" \
--enable-parallel \
--enable-debug \
--enable-shared \
--with-hdf5=$HDF5_PREFIX \
--with-pic \
${config_args} \
|| exit 1
}
pbuild::compile() {

View File

@@ -1,3 +1,5 @@
H5hut/1.99.13 deprecated gcc/{4.7.4,4.8.3,4.8.4,4.9.2} openmpi/{1.6.5,1.8.2,1.8.4} hdf5/{1.8.12,1.8.14}
H5hut/2.0.0rc2 deprecated gcc/4.8.5 openmpi/1.10.2 hdf5/1.8.17 b:automake/1.14 b:autoconf/2.69 b:libtool/2.4.2 b:Python/2.7.12 b:parmetis/4.0.3
H5hut/2.0.0rc3 deprecated gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.17 b:automake/1.14 b:autoconf/2.69 b:libtool/2.4.2 b:Python/2.7.12 b:parmetis/4.0.3