Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks
Conflicts: Compiler/openmpi/1.10/variants.Linux Added gcc/6.2.0
This commit is contained in:
@@ -1,9 +1,4 @@
|
||||
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 stable gcc/4.8.5
|
||||
1.10.2 Linux,Darwin stable gcc/4.9.3
|
||||
1.10.2 Linux,Darwin deprecated gcc/5.2.0
|
||||
1.10.2 Linux,Darwin stable gcc/5.3.0
|
||||
1.10.2 Linux,Darwin unstable gcc/6.1.0
|
||||
1.10.2 Linux unstable intel/15.3
|
||||
openmpi/1.10.2 stable gcc/4.8.5
|
||||
openmpi/1.10.2 stable gcc/4.9.3
|
||||
openmpi/1.10.2 stable gcc/5.3.0
|
||||
openmpi/1.10.2 unstable gcc/6.1.0
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
openmpi/1.10.0 deprecated gcc/4.8.4
|
||||
openmpi/1.10.0 deprecated gcc/4.9.2
|
||||
openmpi/1.10.0 deprecated gcc/4.9.3
|
||||
openmpi/1.10.2 stable gcc/4.8.5
|
||||
openmpi/1.10.2 stable gcc/4.9.3
|
||||
openmpi/1.10.2 deprecated gcc/5.2.0
|
||||
openmpi/1.10.2 stable gcc/5.3.0
|
||||
openmpi/1.10.2 unstable gcc/6.1.0
|
||||
openmpi/1.10.2 unstable intel/15.3
|
||||
@@ -1,7 +1,7 @@
|
||||
1.6.5 stable gcc/4.7.4
|
||||
1.6.5 stable gcc/4.8.3
|
||||
1.6.5 stable gcc/4.8.4
|
||||
1.6.5 stable gcc/4.8.5
|
||||
1.6.5 deprecated gcc/4.9.2
|
||||
1.6.5 stable gcc/4.9.3
|
||||
openmpi/1.6.5 stable gcc/4.7.4
|
||||
openmpi/1.6.5 stable gcc/4.8.3
|
||||
openmpi/1.6.5 stable gcc/4.8.4
|
||||
openmpi/1.6.5 stable gcc/4.8.5
|
||||
openmpi/1.6.5 deprecated gcc/4.9.2
|
||||
openmpi/1.6.5 stable gcc/4.9.3
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
1.6.5 stable gcc/4.7.4
|
||||
1.6.5 stable gcc/4.8.3
|
||||
1.6.5 stable gcc/4.8.4
|
||||
1.6.5 stable gcc/4.8.5
|
||||
1.6.5 deprecated gcc/4.9.2
|
||||
1.6.5 stable gcc/4.9.3
|
||||
1.6.5 stable intel/15.2
|
||||
1.6.5 stable intel/15.3
|
||||
openmpi/1.6.5 stable gcc/4.7.4
|
||||
openmpi/1.6.5 stable gcc/4.8.3
|
||||
openmpi/1.6.5 stable gcc/4.8.4
|
||||
openmpi/1.6.5 stable gcc/4.8.5
|
||||
openmpi/1.6.5 deprecated gcc/4.9.2
|
||||
openmpi/1.6.5 stable gcc/4.9.3
|
||||
openmpi/1.6.5 stable intel/15.2
|
||||
openmpi/1.6.5 stable intel/15.3
|
||||
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
1.8.2 stable gcc/4.7.4
|
||||
1.8.2 stable gcc/4.8.3
|
||||
1.8.2 stable gcc/4.8.4
|
||||
1.8.2 stable gcc/4.8.5
|
||||
1.8.2 deprecated gcc/4.9.2
|
||||
1.8.2 stable gcc/4.9.3
|
||||
1.8.4 stable gcc/4.7.4
|
||||
1.8.4 stable gcc/4.8.3
|
||||
1.8.4 stable gcc/4.8.4
|
||||
1.8.4 stable gcc/4.9.2
|
||||
1.8.8 deprecated gcc/4.8.4
|
||||
1.8.8 stable gcc/4.8.5
|
||||
1.8.8 stable gcc/4.9.3
|
||||
1.8.8 deprecated gcc/5.2.0
|
||||
1.8.8 stable gcc/5.3.0
|
||||
1.8.8 unstable gcc/6.1.0
|
||||
openmpi/1.8.2 stable gcc/4.7.4
|
||||
openmpi/1.8.2 deprecated gcc/4.8.3
|
||||
openmpi/1.8.2 deprecated gcc/4.8.4
|
||||
openmpi/1.8.2 stable gcc/4.8.5
|
||||
openmpi/1.8.2 deprecated gcc/4.9.2
|
||||
openmpi/1.8.2 stable gcc/4.9.3
|
||||
openmpi/1.8.4 stable gcc/4.7.4
|
||||
openmpi/1.8.4 deprecated gcc/4.8.3
|
||||
openmpi/1.8.4 deprecated gcc/4.8.4
|
||||
openmpi/1.8.4 deprecated gcc/4.9.2
|
||||
openmpi/1.8.4 deprecated gcc/4.9.3
|
||||
openmpi/1.8.8 deprecated gcc/4.8.4
|
||||
openmpi/1.8.8 stable gcc/4.8.5
|
||||
openmpi/1.8.8 stable gcc/4.9.3
|
||||
openmpi/1.8.8 deprecated gcc/5.2.0
|
||||
openmpi/1.8.8 stable gcc/5.3.0
|
||||
openmpi/1.8.8 unstable gcc/6.1.0
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
# comment
|
||||
1.8.2 stable gcc/4.7.4
|
||||
1.8.2 stable gcc/4.8.3
|
||||
1.8.2 stable gcc/4.8.4
|
||||
1.8.2 stable gcc/4.8.5
|
||||
1.8.2 deprecated gcc/4.9.2
|
||||
1.8.2 stable gcc/4.9.3
|
||||
1.8.4 stable gcc/4.7.4
|
||||
1.8.4 stable gcc/4.8.3
|
||||
1.8.4 stable gcc/4.8.4
|
||||
1.8.4 stable gcc/4.9.2
|
||||
1.8.8 deprecated gcc/4.8.4
|
||||
1.8.8 stable gcc/4.8.5
|
||||
1.8.8 stable gcc/4.9.3
|
||||
1.8.8 deprecated gcc/5.2.0
|
||||
1.8.8 stable gcc/5.3.0
|
||||
1.8.8 unstable gcc/6.1.0
|
||||
openmpi/1.8.2 stable gcc/4.7.4
|
||||
openmpi/1.8.2 stable gcc/4.8.3
|
||||
openmpi/1.8.2 stable gcc/4.8.4
|
||||
openmpi/1.8.2 stable gcc/4.8.5
|
||||
openmpi/1.8.2 deprecated gcc/4.9.2
|
||||
openmpi/1.8.2 stable gcc/4.9.3
|
||||
openmpi/1.8.4 stable gcc/4.7.4
|
||||
openmpi/1.8.4 stable gcc/4.8.3
|
||||
openmpi/1.8.4 stable gcc/4.8.4
|
||||
openmpi/1.8.4 stable gcc/4.9.2
|
||||
openmpi/1.8.8 deprecated gcc/4.8.4
|
||||
openmpi/1.8.8 stable gcc/4.8.5
|
||||
openmpi/1.8.8 stable gcc/4.9.3
|
||||
openmpi/1.8.8 deprecated gcc/5.2.0
|
||||
openmpi/1.8.8 stable gcc/5.3.0
|
||||
openmpi/1.8.8 unstable gcc/6.1.0
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
2.0.0 Linux,Darwin unstable gcc/6.1.0
|
||||
2.0.0 Linux unstable intel/16.3
|
||||
2.0.1 Linux,Darwin unstable gcc/6.2.0
|
||||
|
||||
@@ -16,7 +16,7 @@ pbuild::configure() {
|
||||
}
|
||||
|
||||
pbuild::add_to_group 'Compiler'
|
||||
pbuild::set_runtime_dependencies "${COMPILER}"
|
||||
pbuild::set_build_dependencies "${COMPILER}"
|
||||
#pbuild::set_runtime_dependencies "${COMPILER}"
|
||||
#pbuild::set_build_dependencies "${COMPILER}"
|
||||
pbuild::set_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
|
||||
pbuild::make_all
|
||||
|
||||
Reference in New Issue
Block a user