Skip to content

Commit

Permalink
Merge branch 'revertLegionSpack2Versions' into 'master'
Browse files Browse the repository at this point in the history
revert the spack legion dep back to using commit instead of branch

See merge request laristra/flecsi!82
  • Loading branch information
ktsai7 committed Dec 17, 2019
2 parents ab7e18e + d4c550d commit 7c44949
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions spack-repo/packages/flecsi/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ class Flecsi(CMakePackage):
depends_on('mpi', when='backend=mpi')
depends_on('mpi', when='backend=legion')
depends_on('mpi', when='backend=hpx')
depends_on('legion@ctrl-rep +shared +mpi build_type=Debug +hdf5', when='backend=legion +debug_backend +hdf5')
depends_on('legion@ctrl-rep +shared +mpi build_type=Debug', when='backend=legion +debug_backend ~hdf5')
depends_on('legion@ctrl-rep +shared +mpi +hdf5', when='backend=legion +hdf5')
depends_on('legion@ctrl-rep +shared +mpi', when='backend=legion ~hdf5')
depends_on('legion@ctrl-rep-3 +shared +mpi build_type=Debug +hdf5', when='backend=legion +debug_backend +hdf5')
depends_on('legion@ctrl-rep-3 +shared +mpi build_type=Debug', when='backend=legion +debug_backend ~hdf5')
depends_on('legion@ctrl-rep-3 +shared +mpi +hdf5', when='backend=legion +hdf5')
depends_on('legion@ctrl-rep-3 +shared +mpi', when='backend=legion ~hdf5')
depends_on('[email protected] cxxstd=14 build_type=Debug', when='backend=hpx +debug_backend')
depends_on('[email protected] cxxstd=14', when='backend=hpx')
depends_on('[email protected]: cxxstd=14 +program_options')
Expand Down
1 change: 1 addition & 0 deletions spack-repo/packages/legion/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class Legion(CMakePackage):

version('master', branch='master')
version('ctrl-rep', branch='control_replication')
version('ctrl-rep-3', commit='572576b312509e666f2d72fafdbe9d968b1a6ac3')
version('ctrl-rep-2', commit='96682fd8aae071ecd30a3ed5f481a9d84457a4b6')
version('ctrl-rep-1', commit='a03671b21851d5f0d3f63210343cb61a630f4405')
version('ctrl-rep-0', commit='177584e77036c9913d8a62e33b55fa784748759c')
Expand Down

0 comments on commit 7c44949

Please sign in to comment.