From a8eee2461d23155ec1df536d8185d0aa50526b56 Mon Sep 17 00:00:00 2001 From: Derek Feichtinger Date: Fri, 23 Aug 2019 10:54:20 +0200 Subject: [PATCH] fix for download URL and merlin6 specific builds --- Compiler/openmpi/build | 5 ++++- Compiler/openmpi/files/variants.Linux | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index c3ae4a0..b53e5f1 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -1,7 +1,10 @@ #!/usr/bin/env modbuild +# pbuild::set_download_url \ + # "http://www.open-mpi.org/software/ompi/v${V_MAJOR}.${V_MINOR}/downloads/openmpi-${V_PKG}.tar.bz2" + pbuild::set_download_url \ - "http://www.open-mpi.org/software/ompi/v${V_MAJOR}.${V_MINOR}/downloads/openmpi-$V.tar.bz2" + "https://download.open-mpi.org/release/open-mpi/v${V_MAJOR}.${V_MINOR}/openmpi-${V_PKG}.tar.bz2" pbuild::set_sha256sum "openmpi-3.1.2.tar.bz2:c654ed847f34a278c52a15c98add40402b4a90f0c540779f1ae6c489af8a76c5" diff --git a/Compiler/openmpi/files/variants.Linux b/Compiler/openmpi/files/variants.Linux index a98b95b..0226f8d 100644 --- a/Compiler/openmpi/files/variants.Linux +++ b/Compiler/openmpi/files/variants.Linux @@ -41,6 +41,7 @@ openmpi/3.1.2 stable gcc/{7.3.0,8.2.0} openmpi/3.1.2 stable intel/18.4 openmpi/3.1.3 stable gcc/{4.8.5,5.5.0,6.4.0,6.5.0,7.3.0,8.2.0,8.3.0} openmpi/3.1.4 stable gcc/{7.4.0,8.3.0} +openmpi/3.1.4_merlin6 stable gcc/{7.4.0,8.3.0} openmpi/4.0.0 unstable gcc/{5.5,6.4,6.5,7.3,7.4,8.2,8.3}.0