Merge remote branch 'origin/HEAD'

This commit is contained in:
2016-05-02 14:49:16 +02:00
31 changed files with 122 additions and 83 deletions

View File

@@ -1,4 +1,9 @@
:Linux:Darwin: unstable gcc/4.8.5
:Linux:Darwin: unstable gcc/4.9.3
:Linux:Darwin: unstable gcc/5.2.0
:Linux: unstable intel/15.3
# comment
1.10.0 Linux,Darwin deprecated gcc/4.8.4
1.10.0 Linux,Darwin deprecated gcc/4.9.2
1.10.0 Linux,Darwin deprecated gcc/4.9.3
1.10.2 Linux,Darwin unstable gcc/4.8.5
1.10.2 Linux,Darwin unstable gcc/4.9.3
1.10.2 Linux,Darwin unstable gcc/5.2.0
1.10.2 Linux,Darwin unstable gcc/5.3.0
1.10.2 Linux unstable intel/15.3

View File

@@ -1,8 +1,14 @@
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.7.4
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.8.3
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.8.4
1.8.2,1.8.4,1.8.8 unstable Linux,Darwin gcc/4.8.5
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.9.2
1.8.2,1.8.4,1.8.8 unstable Linux,Darwin gcc/4.9.3
# comment
1.8.2 Linux,Darwin stable gcc/4.7.4
1.8.2 Linux,Darwin stable gcc/4.8.3
1.8.2 Linux,Darwin stable gcc/4.8.4
1.8.2 Linux,Darwin stable gcc/4.9.2
1.8.4 Linux,Darwin stable gcc/4.7.4
1.8.4 Linux,Darwin stable gcc/4.8.3
1.8.4 Linux,Darwin stable gcc/4.8.4
1.8.4 Linux,Darwin stable gcc/4.9.2
1.8.8 Linux,Darwin deprecated gcc/4.8.4
1.8.8 Linux,Darwin unstable gcc/4.8.5
1.8.8 Linux,Darwin unstable gcc/4.9.3
1.8.8 Linux,Darwin deprecated gcc/5.2.0
1.8.8 Linux,Darwin unstable gcc/5.3.0

View File

@@ -7,8 +7,11 @@ pbuild::configure() {
--enable-mpi-cxx-seek \
--enable-mpi-f90 \
--enable-mpi-profile \
--enable-orterun-prefix-by-default \
--enable-shared \
--enable-smp-locks \
--with-sge=yes \
--with-slurm=yes \
|| exit 1
}