Skip to content

Commit 7c44949

Browse files
committed
Merge branch 'revertLegionSpack2Versions' into 'master'
revert the spack legion dep back to using commit instead of branch See merge request laristra/flecsi!82
2 parents ab7e18e + d4c550d commit 7c44949

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

spack-repo/packages/flecsi/package.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class Flecsi(CMakePackage):
5757
depends_on('mpi', when='backend=mpi')
5858
depends_on('mpi', when='backend=legion')
5959
depends_on('mpi', when='backend=hpx')
60-
depends_on('legion@ctrl-rep +shared +mpi build_type=Debug +hdf5', when='backend=legion +debug_backend +hdf5')
61-
depends_on('legion@ctrl-rep +shared +mpi build_type=Debug', when='backend=legion +debug_backend ~hdf5')
62-
depends_on('legion@ctrl-rep +shared +mpi +hdf5', when='backend=legion +hdf5')
63-
depends_on('legion@ctrl-rep +shared +mpi', when='backend=legion ~hdf5')
60+
depends_on('legion@ctrl-rep-3 +shared +mpi build_type=Debug +hdf5', when='backend=legion +debug_backend +hdf5')
61+
depends_on('legion@ctrl-rep-3 +shared +mpi build_type=Debug', when='backend=legion +debug_backend ~hdf5')
62+
depends_on('legion@ctrl-rep-3 +shared +mpi +hdf5', when='backend=legion +hdf5')
63+
depends_on('legion@ctrl-rep-3 +shared +mpi', when='backend=legion ~hdf5')
6464
depends_on('hpx@1.3.0 cxxstd=14 build_type=Debug', when='backend=hpx +debug_backend')
6565
depends_on('hpx@1.3.0 cxxstd=14', when='backend=hpx')
6666
depends_on('boost@1.70.0: cxxstd=14 +program_options')

spack-repo/packages/legion/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class Legion(CMakePackage):
2727

2828
version('master', branch='master')
2929
version('ctrl-rep', branch='control_replication')
30+
version('ctrl-rep-3', commit='572576b312509e666f2d72fafdbe9d968b1a6ac3')
3031
version('ctrl-rep-2', commit='96682fd8aae071ecd30a3ed5f481a9d84457a4b6')
3132
version('ctrl-rep-1', commit='a03671b21851d5f0d3f63210343cb61a630f4405')
3233
version('ctrl-rep-0', commit='177584e77036c9913d8a62e33b55fa784748759c')

0 commit comments

Comments
 (0)