conflict resolved
This commit is contained in:
@@ -4,7 +4,6 @@ pbuild::set_download_url \
|
||||
"https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2"
|
||||
|
||||
pbuild::add_to_group 'Compiler'
|
||||
|
||||
pbuild::install_docfiles ACKNOWLEDGMENTS
|
||||
pbuild::install_docfiles COPYING
|
||||
pbuild::install_docfiles MANIFEST
|
||||
@@ -45,5 +44,3 @@ pbuild::pre_configure() {
|
||||
pbuild::add_configure_args "--enable-fortran"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -45,9 +45,12 @@ hdf5_serial/1.8.19 stable gcc/5.4.0
|
||||
hdf5_serial/1.8.19 stable gcc/6.3.0
|
||||
hdf5_serial/1.8.19 stable gcc/7.2.0
|
||||
|
||||
hdf5_serial/1.8.20 stable gcc/4.8.5
|
||||
hdf5_serial/1.8.20 stable gcc/5.5.0
|
||||
hdf5_serial/1.8.20 stable gcc/6.4.0
|
||||
hdf5_serial/1.8.20 stable gcc/7.3.0
|
||||
hdf5_serial/1.8.20 stable gcc/8.2.0
|
||||
hdf5_serial/1.8.20 stable intel/18.4
|
||||
|
||||
hdf5_serial/1.10.1 stable gcc/4.8.5
|
||||
hdf5_serial/1.10.1 stable gcc/4.9.4
|
||||
@@ -72,3 +75,12 @@ hdf5_serial/1.10.2 stable gcc/7.3.0
|
||||
hdf5_serial/1.10.2 stable intel/18.2
|
||||
hdf5_serial/1.10.2 unstable pgi/18.5
|
||||
hdf5_serial/1.10.2 stable intel/18.3
|
||||
|
||||
hdf5_serial/1.10.3 stable gcc/4.8.5
|
||||
hdf5_serial/1.10.3 stable gcc/5.5.0
|
||||
hdf5_serial/1.10.3 stable gcc/6.4.0
|
||||
hdf5_serial/1.10.3 stable gcc/7.3.0
|
||||
hdf5_serial/1.10.3 stable gcc/8.2.0
|
||||
hdf5_serial/1.10.3 stable intel/18.4
|
||||
|
||||
hdf5_serial/1.10.4 stable gcc/7.3.0
|
||||
|
||||
@@ -14,6 +14,8 @@ openmpi/3.1.1 stable gcc/8.1.0
|
||||
openmpi/3.1.1 stable gcc/8.2.0
|
||||
|
||||
openmpi/3.1.2 stable gcc/7.3.0
|
||||
openmpi/3.1.2 stable gcc/8.2.0
|
||||
openmpi/3.1.2 stable intel/18.4
|
||||
|
||||
openmpi/3.1.3 stable gcc/4.8.5
|
||||
openmpi/3.1.3 stable gcc/5.5.0
|
||||
|
||||
Reference in New Issue
Block a user