hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openmpi: switch to using main (#29725)

Browse source 
The Open MPI project has elected to name our development branch - main.

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
This commit is contained in:
Howard Pritchard 2022-03-27 05:01:33 -06:00 committed by GitHub
parent b1f38f6fa2
commit bb9ac2be9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
var/spack/repos/builtin/packages/openmpi/package.py
View file

@ -36,7 +36,7 @@ class Openmpi(AutotoolsPackage):
tags = ['e4s'] tags = ['e4s']
version('master', branch='master', submodules=True) version('main', branch='main', submodules=True)
# Current # Current
version('4.1.2', sha256='9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527') # libmpi.so.40.30.2 version('4.1.2', sha256='9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527') # libmpi.so.40.30.2
@ -180,7 +180,7 @@ class Openmpi(AutotoolsPackage):
patch('nag_pthread/2.0.0_2.1.1.patch', when='@2.0.0:2.1.1%nag') patch('nag_pthread/2.0.0_2.1.1.patch', when='@2.0.0:2.1.1%nag')
patch('nag_pthread/1.10.4_1.10.999.patch', when='@1.10.4:1.10%nag') patch('nag_pthread/1.10.4_1.10.999.patch', when='@1.10.4:1.10%nag')
patch('nvhpc-libtool.patch', when='@master %nvhpc') patch('nvhpc-libtool.patch', when='@main %nvhpc')
patch('nvhpc-configure.patch', when='%nvhpc') patch('nvhpc-configure.patch', when='%nvhpc')
# Fix MPI_Sizeof() in the "mpi" Fortran module for compilers that do not # Fix MPI_Sizeof() in the "mpi" Fortran module for compilers that do not
@ -272,11 +272,11 @@ class Openmpi(AutotoolsPackage):
if sys.platform != 'darwin': if sys.platform != 'darwin':
depends_on('numactl') depends_on('numactl')
depends_on('autoconf @2.69:', type='build', when='@master') depends_on('autoconf @2.69:', type='build', when='@main')
depends_on('automake @1.13.4:', type='build', when='@master') depends_on('automake @1.13.4:', type='build', when='@main')
depends_on('libtool @2.4.2:', type='build', when='@master') depends_on('libtool @2.4.2:', type='build', when='@main')
depends_on('m4', type='build', when='@master') depends_on('m4', type='build', when='@main')
depends_on('pandoc', type='build', when='@master') depends_on('pandoc', type='build', when='@main')
depends_on('perl', type='build') depends_on('perl', type='build')
depends_on('pkgconfig', type='build') depends_on('pkgconfig', type='build')
@ -615,7 +615,7 @@ def die_without_fortran(self):
'OpenMPI requires both C and Fortran compilers!' 'OpenMPI requires both C and Fortran compilers!'
) )
@when('@master') @when('@main')
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
perl = which('perl') perl = which('perl')
perl('autogen.pl') perl('autogen.pl')