From 6f2ea6754b10d008eaed31277d0f5c4dc48048e4 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:52:46 +0200 Subject: [PATCH 01/11] Programming/gcc/4/configure-as.patch - patch required for Mac OS X 11 and Xcode 7 --- Programming/gcc/4/configure-as.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Programming/gcc/4/configure-as.patch diff --git a/Programming/gcc/4/configure-as.patch b/Programming/gcc/4/configure-as.patch new file mode 100644 index 0000000..16741eb --- /dev/null +++ b/Programming/gcc/4/configure-as.patch @@ -0,0 +1,20 @@ +--- a/gcc/configure 2016-06-08 19:22:30.000000000 +0200 ++++ b/gcc/configure 2016-06-08 19:23:41.000000000 +0200 +@@ -24542,7 +24542,7 @@ + else + gcc_cv_as_ix86_filds=no + if test x$gcc_cv_as != x; then +- $as_echo 'filds mem; fists mem' > conftest.s ++ $as_echo 'filds (%ebp); fists (%ebp)' > conftest.s + if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 +@@ -24573,7 +24573,7 @@ + else + gcc_cv_as_ix86_fildq=no + if test x$gcc_cv_as != x; then +- $as_echo 'fildq mem; fistpq mem' > conftest.s ++ $as_echo 'fildq (%ebp); fistpq (%ebp)' > conftest.s + if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 From e0585540aecbe1d571ba159d27e0542dd22b4618 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:54:45 +0200 Subject: [PATCH 02/11] Compiler/hdf5_serial/1/variants - variants for hdf5 1.8.16 and 1.8.17 added - set variants for outdated compilers to deprecated --- Compiler/hdf5_serial/1/variants | 36 ++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants index e4e9583..0403a63 100644 --- a/Compiler/hdf5_serial/1/variants +++ b/Compiler/hdf5_serial/1/variants @@ -1,9 +1,27 @@ -hdf5_serial/1.8.12 stable gcc/4.7.4 -hdf5_serial/1.8.12 stable gcc/4.8.3 -hdf5_serial/1.8.12 stable gcc/4.8.4 -hdf5_serial/1.8.12 stable gcc/4.9.2 -hdf5_serial/1.8.14 stable gcc/4.7.4 -hdf5_serial/1.8.14 stable gcc/4.8.3 -hdf5_serial/1.8.14 stable gcc/4.8.4 -hdf5_serial/1.8.14 stable gcc/4.9.2 -hdf5_serial/1.8.15-patch1 unstable gcc/5.2.0 +hdf5_serial/1.8.12 stable gcc/4.7.4 +hdf5_serial/1.8.12 deprecated gcc/4.8.3 +hdf5_serial/1.8.12 deprecated gcc/4.8.4 +#hdf5_serial/1.8.12 stable gcc/4.8.5 +hdf5_serial/1.8.12 deprecated gcc/4.9.2 +#hdf5_serial/1.8.12 stable gcc/4.9.3 + +hdf5_serial/1.8.14 stable gcc/4.7.4 +hdf5_serial/1.8.14 deprecated gcc/4.8.3 +hdf5_serial/1.8.14 deprecated gcc/4.8.4 +hdf5_serial/1.8.14 stable gcc/4.8.5 +hdf5_serial/1.8.14 deprecated gcc/4.9.2 +hdf5_serial/1.8.14 stable gcc/4.9.3 + +hdf5_serial/1.8.15-patch1 unstable gcc/5.2.0 + +hdf5_serial/1.8.16 stable gcc/4.7.4 +hdf5_serial/1.8.16 stable gcc/4.8.5 +hdf5_serial/1.8.16 stable gcc/4.9.3 +hdf5_serial/1.8.16 stable gcc/5.3.0 +hdf5_serial/1.8.16 stable gcc/6.1.0 + +hdf5_serial/1.8.17 stable gcc/4.7.4 +hdf5_serial/1.8.17 stable gcc/4.8.5 +hdf5_serial/1.8.17 stable gcc/4.9.3 +hdf5_serial/1.8.17 stable gcc/5.3.0 +hdf5_serial/1.8.17 stable gcc/6.1.0 From f5a1184062732ba63a0c9ea9c993388d3d1ddaae Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:56:05 +0200 Subject: [PATCH 03/11] Programming/gcc/build - patch of main configure added to fix assembler problems on Mac OS X and Xclode 7 --- Programming/gcc/build | 1 + 1 file changed, 1 insertion(+) diff --git a/Programming/gcc/build b/Programming/gcc/build index 6a81083..03cb483 100755 --- a/Programming/gcc/build +++ b/Programming/gcc/build @@ -3,6 +3,7 @@ pbuild::patch_sources_Darwin() { if [[ "${V_MAJOR}" == "4" ]]; then patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch" + patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/configure-as.patch" fi } From b70dab79b960db2abfba35c0ca2ec24962b1429c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:56:53 +0200 Subject: [PATCH 04/11] MPI/hdf5/1.8/variants - changed to new requirements --- MPI/hdf5/1.8/variants | 71 ++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/MPI/hdf5/1.8/variants b/MPI/hdf5/1.8/variants index 437bd40..6836047 100644 --- a/MPI/hdf5/1.8/variants +++ b/MPI/hdf5/1.8/variants @@ -1,34 +1,37 @@ -1.8.12 stable gcc/4.7.4 openmpi/1.6.5 -1.8.12 stable gcc/4.7.4 openmpi/1.8.2 -1.8.12 stable gcc/4.7.4 openmpi/1.8.4 -1.8.12 stable gcc/4.8.3 openmpi/1.6.5 -1.8.12 stable gcc/4.8.3 openmpi/1.8.2 -1.8.12 stable gcc/4.8.3 openmpi/1.8.4 -1.8.12 stable gcc/4.8.4 openmpi/1.6.5 -1.8.12 stable gcc/4.8.4 openmpi/1.8.2 -1.8.12 stable gcc/4.8.4 openmpi/1.8.4 -1.8.12 deprecated gcc/4.9.2 openmpi/1.6.5 -1.8.12 deprecated gcc/4.9.2 openmpi/1.8.2 -1.8.12 deprecated gcc/4.9.2 openmpi/1.8.4 -1.8.14 stable gcc/4.7.4 openmpi/1.6.5 -1.8.14 stable gcc/4.7.4 openmpi/1.8.2 -1.8.14 stable gcc/4.7.4 openmpi/1.8.4 -1.8.14 stable gcc/4.8.3 openmpi/1.6.5 -1.8.14 stable gcc/4.8.3 openmpi/1.8.2 -1.8.14 stable gcc/4.8.3 openmpi/1.8.4 -1.8.14 stable gcc/4.8.4 openmpi/1.6.5 -1.8.14 stable gcc/4.8.4 openmpi/1.8.2 -1.8.14 stable gcc/4.8.4 openmpi/1.8.4 -1.8.14 stable gcc/4.8.4 openmpi/1.8.8 -1.8.14 deprecated gcc/4.9.2 openmpi/1.6.5 -1.8.14 deprecated gcc/4.9.2 openmpi/1.8.2 -1.8.14 deprecated gcc/4.9.2 openmpi/1.8.4 -1.8.15.1 deprecated gcc/5.2.0 openmpi/1.8.8 -1.8.16 stable gcc/4.8.5 openmpi/1.8.8 -1.8.16 stable gcc/4.8.5 openmpi/1.10.2 -1.8.16 stable gcc/4.9.3 openmpi/1.8.8 -1.8.16 stable gcc/4.9.3 openmpi/1.10.2 -1.8.16 stable gcc/5.3.0 openmpi/1.8.8 -1.8.16 stable gcc/5.3.0 openmpi/1.10.2 -1.8.16 unstable gcc/6.1.0 openmpi/1.8.8 -1.8.16 unstable gcc/6.1.0 openmpi/1.10.2 +hdf5/1.8.12 stable gcc/4.7.4 openmpi/1.6.5 +hdf5/1.8.12 stable gcc/4.7.4 openmpi/1.8.2 +hdf5/1.8.12 stable gcc/4.7.4 openmpi/1.8.4 +hdf5/1.8.12 stable gcc/4.8.3 openmpi/1.6.5 +hdf5/1.8.12 stable gcc/4.8.3 openmpi/1.8.2 +hdf5/1.8.12 stable gcc/4.8.3 openmpi/1.8.4 +hdf5/1.8.12 stable gcc/4.8.4 openmpi/1.6.5 +hdf5/1.8.12 stable gcc/4.8.4 openmpi/1.8.2 +hdf5/1.8.12 stable gcc/4.8.4 openmpi/1.8.4 +hdf5/1.8.12 deprecated gcc/4.9.2 openmpi/1.6.5 +hdf5/1.8.12 deprecated gcc/4.9.2 openmpi/1.8.2 +hdf5/1.8.12 deprecated gcc/4.9.2 openmpi/1.8.4 + +hdf5/1.8.14 stable gcc/4.7.4 openmpi/1.6.5 +hdf5/1.8.14 stable gcc/4.7.4 openmpi/1.8.2 +hdf5/1.8.14 stable gcc/4.7.4 openmpi/1.8.4 +hdf5/1.8.14 stable gcc/4.8.3 openmpi/1.6.5 +hdf5/1.8.14 stable gcc/4.8.3 openmpi/1.8.2 +hdf5/1.8.14 stable gcc/4.8.3 openmpi/1.8.4 +hdf5/1.8.14 stable gcc/4.8.4 openmpi/1.6.5 +hdf5/1.8.14 stable gcc/4.8.4 openmpi/1.8.2 +hdf5/1.8.14 stable gcc/4.8.4 openmpi/1.8.4 +hdf5/1.8.14 stable gcc/4.8.4 openmpi/1.8.8 +hdf5/1.8.14 deprecated gcc/4.9.2 openmpi/1.6.5 +hdf5/1.8.14 deprecated gcc/4.9.2 openmpi/1.8.2 +hdf5/1.8.14 deprecated gcc/4.9.2 openmpi/1.8.4 + +hdf5/1.8.15.1 deprecated gcc/5.2.0 openmpi/1.8.8 + +hdf5/1.8.16 stable gcc/4.8.5 openmpi/1.8.8 +hdf5/1.8.16 stable gcc/4.8.5 openmpi/1.10.2 +hdf5/1.8.16 stable gcc/4.9.3 openmpi/1.8.8 +hdf5/1.8.16 stable gcc/4.9.3 openmpi/1.10.2 +hdf5/1.8.16 stable gcc/5.3.0 openmpi/1.8.8 +hdf5/1.8.16 stable gcc/5.3.0 openmpi/1.10.2 +hdf5/1.8.16 unstable gcc/6.1.0 openmpi/1.8.8 +hdf5/1.8.16 unstable gcc/6.1.0 openmpi/1.10.2 From d6fb8df904dfb3602fe8d39fea1f94171581162c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:58:01 +0200 Subject: [PATCH 05/11] Compiler/openmpi/build - setting dependencies in the build-block is now deprecated --- Compiler/openmpi/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index 271e5e6..b07ecc6 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -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 From 57897bd11392752e4a40877b2888381fa8da5d6d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:58:53 +0200 Subject: [PATCH 06/11] Compiler/openmpi/1.8/variants.Darwin - adapted to new format --- Compiler/openmpi/1.8/variants.Darwin | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Compiler/openmpi/1.8/variants.Darwin b/Compiler/openmpi/1.8/variants.Darwin index e945788..1b4eaf7 100644 --- a/Compiler/openmpi/1.8/variants.Darwin +++ b/Compiler/openmpi/1.8/variants.Darwin @@ -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 From 239f498d308070da5100199d2428bc3f050ea8b8 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 18:59:53 +0200 Subject: [PATCH 07/11] Compiler/openmpi/1.10/variants.Darwin - cleanup - adapted to new format --- Compiler/openmpi/1.10/variants.Darwin | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Compiler/openmpi/1.10/variants.Darwin b/Compiler/openmpi/1.10/variants.Darwin index e5cdf8c..ab8e0c1 100644 --- a/Compiler/openmpi/1.10/variants.Darwin +++ b/Compiler/openmpi/1.10/variants.Darwin @@ -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 From bd4586fe01728f58d4a54fe7cbf562326159d51d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 27 Jul 2016 19:20:29 +0200 Subject: [PATCH 08/11] conflicts merged --- Libraries/gmp/5/variants | 2 +- Libraries/gmp/6/variants | 5 +++-- MPI/hdf5/build | 17 ++++++++++------- Programming/gcc/5/variants | 1 + Programming/gcc/build | 1 + bin/manage_variants | 4 ++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Libraries/gmp/5/variants b/Libraries/gmp/5/variants index a951566..02b5e29 100644 --- a/Libraries/gmp/5/variants +++ b/Libraries/gmp/5/variants @@ -1 +1 @@ -5.1.1 stable +gmp/5.1.1 stable diff --git a/Libraries/gmp/6/variants b/Libraries/gmp/6/variants index a18f6eb..c23f150 100644 --- a/Libraries/gmp/6/variants +++ b/Libraries/gmp/6/variants @@ -1,2 +1,3 @@ -6.0.0 stable -6.1.0 stable +gmp/6.0.0 stable +gmp/6.1.0 stable +gmp/6.1.1 stable diff --git a/MPI/hdf5/build b/MPI/hdf5/build index e44dbbb..9bcf96a 100755 --- a/MPI/hdf5/build +++ b/MPI/hdf5/build @@ -8,15 +8,18 @@ pbuild::configure() { FC=$MPIFC FORTRAN=$MPIFORTRAN + local conf='' + conf+=' --enable-shared' + conf+=' --enable-parallel' + conf+=' --enable-cxx' + conf+=' --enable-fortran' + conf+=' --enable-unsupported' + #conf+=' --enable-threadsafe' + conf+=' --with-pic' + "${MODULE_SRCDIR}"/configure \ --prefix="${PREFIX}" \ - --enable-shared \ - --enable-parallel \ - --enable-cxx \ - --enable-fortran \ - --enable-unsupported \ - --enable-threadsafe \ - --with-pic \ + ${conf} \ || exit 1 } diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants index e71b999..5600a58 100644 --- a/Programming/gcc/5/variants +++ b/Programming/gcc/5/variants @@ -1,4 +1,5 @@ gcc/5.1.0 deprecated b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2 gcc/5.2.0 deprecated b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3 gcc/5.3.0 stable b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3 +gcc/5.4.0 unstable b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3 diff --git a/Programming/gcc/build b/Programming/gcc/build index 03cb483..1160fbc 100755 --- a/Programming/gcc/build +++ b/Programming/gcc/build @@ -16,6 +16,7 @@ pbuild::configure() { --with-mpc="${MPC_PREFIX}" \ --enable-lto \ --disable-multilib \ + --with-build-config=bootstrap-debug \ --with-pkgversion="PSI Environment Module" \ --with-build-config=bootstrap-debug \ || exit 1 diff --git a/bin/manage_variants b/bin/manage_variants index 200a799..fe8b725 100755 --- a/bin/manage_variants +++ b/bin/manage_variants @@ -6,7 +6,7 @@ declare variants=$2 declare -r OS=$(uname -s) # File format example -# 1.10.2 unstable gcc/4.8.5 +# openmpi/1.10.2 unstable gcc/4.8.5 declare -a toks=() declare version='' declare release='' @@ -22,7 +22,7 @@ while read -a toks; do "${buildblock}" "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}" if [[ $? != 0 ]]; then - echo "Failed building: ${version} --release=${release} ${dependencies[@]/#/--with=}" 1>&2 + echo "Failed building: ${module} --release=${release} ${dependencies[@]/#/--with=}" 1>&2 exit 42 fi done < "${variants}" From 9461af59e77a3d2cab2280962b566df04063f26a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 29 Jul 2016 16:54:10 +0200 Subject: [PATCH 09/11] variant-files adapted to new format --- Compiler/atlas/3/variants | 3 ++- Compiler/openmpi/1.10/variants.Linux | 18 ++++++------- Compiler/openmpi/1.6/variants.Darwin | 12 ++++----- Compiler/openmpi/1.6/variants.Linux | 16 ++++++------ Compiler/openmpi/1.8/variants.Linux | 33 ++++++++++++------------ Libraries/mpc/1/variants | 5 ++-- Libraries/mpfr/3/variants | 1 + MPI/hdf5/1.10/variants | 8 +++--- MPI/parmetis/3/variants | 38 ++++++++++++++-------------- MPI/parmetis/4/variants | 4 +-- Programming/Python/2/variants | 2 +- 11 files changed, 71 insertions(+), 69 deletions(-) diff --git a/Compiler/atlas/3/variants b/Compiler/atlas/3/variants index 3b20709..2b60606 100644 --- a/Compiler/atlas/3/variants +++ b/Compiler/atlas/3/variants @@ -1 +1,2 @@ -atlas/3.10.2 unstable gcc/4.9.2 +atlas/3.10.2 deprecated gcc/4.9.2 +atlas/3.10.3 unstable gcc/4.9.3 diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux index e5cdf8c..9f33c22 100644 --- a/Compiler/openmpi/1.10/variants.Linux +++ b/Compiler/openmpi/1.10/variants.Linux @@ -1,9 +1,9 @@ -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.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 diff --git a/Compiler/openmpi/1.6/variants.Darwin b/Compiler/openmpi/1.6/variants.Darwin index dfa076f..7e8329a 100644 --- a/Compiler/openmpi/1.6/variants.Darwin +++ b/Compiler/openmpi/1.6/variants.Darwin @@ -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 diff --git a/Compiler/openmpi/1.6/variants.Linux b/Compiler/openmpi/1.6/variants.Linux index 97d9698..c806108 100644 --- a/Compiler/openmpi/1.6/variants.Linux +++ b/Compiler/openmpi/1.6/variants.Linux @@ -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 diff --git a/Compiler/openmpi/1.8/variants.Linux b/Compiler/openmpi/1.8/variants.Linux index 27a67e8..b6a408a 100644 --- a/Compiler/openmpi/1.8/variants.Linux +++ b/Compiler/openmpi/1.8/variants.Linux @@ -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 diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants index 9062e76..52a87b1 100644 --- a/Libraries/mpc/1/variants +++ b/Libraries/mpc/1/variants @@ -1,2 +1,3 @@ -1.0.2 stable b:gmp/5.1.1 b:mpfr/3.1.2 -1.0.3 stable b:gmp/6.1.0 b:mpfr/3.1.4 +mpc/1.0.2 stable b:gmp/5.1.1 b:mpfr/3.1.2 +mpc/1.0.3 stable b:gmp/6.1.0 b:mpfr/3.1.4 +mpc/1.0.3-1 stable b:gmp/6.1.1 b:mpfr/3.1.4 diff --git a/Libraries/mpfr/3/variants b/Libraries/mpfr/3/variants index 0f0939d..58f0e6e 100644 --- a/Libraries/mpfr/3/variants +++ b/Libraries/mpfr/3/variants @@ -1,3 +1,4 @@ mpfr/3.1.2 stable b:gmp/5.1.1 mpfr/3.1.3 stable b:gmp/6.0.0 mpfr/3.1.4 stable b:gmp/6.1.0 +mpfr/3.1.4-1 stable b:gmp/6.1.1 diff --git a/MPI/hdf5/1.10/variants b/MPI/hdf5/1.10/variants index 4c9b517..5f896a2 100644 --- a/MPI/hdf5/1.10/variants +++ b/MPI/hdf5/1.10/variants @@ -1,5 +1,5 @@ -1.10.0 unstable gcc/4.8.5 openmpi/1.10.2 -1.10.0 unstable gcc/4.9.3 openmpi/1.10.2 -1.10.0 unstable gcc/5.3.0 openmpi/1.10.2 -1.10.0 unstable gcc/6.1.0 openmpi/1.10.2 +hdf5/1.10.0 unstable gcc/4.8.5 openmpi/1.10.2 +hdf5/1.10.0 unstable gcc/4.9.3 openmpi/1.10.2 +hdf5/1.10.0 unstable gcc/5.3.0 openmpi/1.10.2 +hdf5/1.10.0 unstable gcc/6.1.0 openmpi/1.10.2 diff --git a/MPI/parmetis/3/variants b/MPI/parmetis/3/variants index 7877450..d5719a2 100644 --- a/MPI/parmetis/3/variants +++ b/MPI/parmetis/3/variants @@ -1,19 +1,19 @@ -3.2.0 stable gcc/4.7.4 openmpi/1.6.5 -3.2.0 stable gcc/4.7.4 openmpi/1.8.2 -3.2.0 stable gcc/4.7.4 openmpi/1.8.4 -3.2.0 stable gcc/4.7.4 openmpi/1.8.8 -3.2.0 stable gcc/4.8.3 openmpi/1.6.5 -3.2.0 stable gcc/4.8.3 openmpi/1.8.2 -3.2.0 stable gcc/4.8.3 openmpi/1.8.4 -3.2.0 stable gcc/4.8.4 openmpi/1.6.5 -3.2.0 stable gcc/4.8.4 openmpi/1.8.2 -3.2.0 stable gcc/4.8.4 openmpi/1.8.4 -3.2.0 stable gcc/4.8.5 openmpi/1.8.8 -3.2.0 stable gcc/4.9.2 openmpi/1.6.5 -3.2.0 stable gcc/4.9.2 openmpi/1.8.2 -3.2.0 stable gcc/4.9.2 openmpi/1.8.4 -3.2.0 stable gcc/4.9.3 openmpi/1.8.8 -3.2.0 unstable gcc/5.3.0 openmpi/1.8.8 -3.2.0 unstable gcc/5.3.0 openmpi/1.10.2 -3.2.0 unstable gcc/6.1.0 openmpi/1.8.8 -3.2.0 unstable gcc/6.1.0 openmpi/1.10.2 +parmetis/3.2.0 stable gcc/4.7.4 openmpi/1.6.5 +parmetis/3.2.0 stable gcc/4.7.4 openmpi/1.8.2 +parmetis/3.2.0 stable gcc/4.7.4 openmpi/1.8.4 +parmetis/3.2.0 stable gcc/4.7.4 openmpi/1.8.8 +parmetis/3.2.0 stable gcc/4.8.3 openmpi/1.6.5 +parmetis/3.2.0 stable gcc/4.8.3 openmpi/1.8.2 +parmetis/3.2.0 stable gcc/4.8.3 openmpi/1.8.4 +parmetis/3.2.0 stable gcc/4.8.4 openmpi/1.6.5 +parmetis/3.2.0 stable gcc/4.8.4 openmpi/1.8.2 +parmetis/3.2.0 stable gcc/4.8.4 openmpi/1.8.4 +parmetis/3.2.0 stable gcc/4.8.5 openmpi/1.8.8 +parmetis/3.2.0 stable gcc/4.9.2 openmpi/1.6.5 +parmetis/3.2.0 stable gcc/4.9.2 openmpi/1.8.2 +parmetis/3.2.0 stable gcc/4.9.2 openmpi/1.8.4 +parmetis/3.2.0 stable gcc/4.9.3 openmpi/1.8.8 +parmetis/3.2.0 unstable gcc/5.3.0 openmpi/1.8.8 +parmetis/3.2.0 unstable gcc/5.3.0 openmpi/1.10.2 +parmetis/3.2.0 unstable gcc/6.1.0 openmpi/1.8.8 +parmetis/3.2.0 unstable gcc/6.1.0 openmpi/1.10.2 diff --git a/MPI/parmetis/4/variants b/MPI/parmetis/4/variants index 3c39cce..80a1b88 100644 --- a/MPI/parmetis/4/variants +++ b/MPI/parmetis/4/variants @@ -1,2 +1,2 @@ -4.0.3 unstable gcc/5.3.0 openmpi/1.10.2 cmake -4.0.3 unstable gcc/6.1.0 openmpi/1.10.2 cmake +parmetis/4.0.3 unstable gcc/5.3.0 openmpi/1.10.2 b:cmake +parmetis/4.0.3 unstable gcc/6.1.0 openmpi/1.10.2 b:cmake diff --git a/Programming/Python/2/variants b/Programming/Python/2/variants index dedba44..03c45ea 100644 --- a/Programming/Python/2/variants +++ b/Programming/Python/2/variants @@ -1 +1 @@ -2.7.11 unstable openssl/1.0.2h Tcl/8.6.4 Tk/8.6.4 +Python/2.7.11 unstable openssl/1.0.2h Tcl/8.6.4 Tk/8.6.4 From 368fcdee9972fb32e1d76acd0b97f4eeeffb274c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 29 Jul 2016 16:55:15 +0200 Subject: [PATCH 10/11] Compiler/atlas/build: - dependencies are now set in the variants-file --- Compiler/atlas/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/Compiler/atlas/build b/Compiler/atlas/build index f3ac585..43dc1a2 100755 --- a/Compiler/atlas/build +++ b/Compiler/atlas/build @@ -7,8 +7,6 @@ pbuild::configure() { } pbuild::add_to_group 'Compiler' -pbuild::set_runtime_dependencies "${COMPILER}" -pbuild::set_build_dependencies "${COMPILER}" pbuild::make_all # Local Variables: From 4f7fcf8f14aad07b06b26499bb6e1f5eb9db2fb9 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 29 Jul 2016 16:55:55 +0200 Subject: [PATCH 11/11] Compile/atlas/modulefile: - use extended module commands --- Compiler/atlas/modulefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Compiler/atlas/modulefile b/Compiler/atlas/modulefile index cdc35aa..0aa7a3b 100644 --- a/Compiler/atlas/modulefile +++ b/Compiler/atlas/modulefile @@ -1,12 +1,10 @@ #%Module1.0 -source $env(PSI_LIBMODULES) - -set whatis "efficient BLAS and partial LAPACK implementation" -set url "http://math-atlas.sourceforge.net/" -set license "BSD-style license" -set maintainer "Achim Gsell " -set help " +module-whatis "efficient BLAS and partial LAPACK implementation" +module-url "http://math-atlas.sourceforge.net/" +module-license "BSD-style license" +module-maintainer "Achim Gsell " +mdoule-help " The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing research effort focusing on applying empirical techniques in order to provide portable performance. At present, it provides C and