From d4c550d82f486ab0b2930d67bcd0af190b6c9f2e Mon Sep 17 00:00:00 2001 From: Karen Chung-Yen Tsai Date: Tue, 17 Dec 2019 13:34:16 -0700 Subject: [PATCH] revert the spack legion dep back to using commit instead of branch --- spack-repo/packages/flecsi/package.py | 8 ++++---- spack-repo/packages/legion/package.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spack-repo/packages/flecsi/package.py b/spack-repo/packages/flecsi/package.py index 4d872a80c..868201822 100644 --- a/spack-repo/packages/flecsi/package.py +++ b/spack-repo/packages/flecsi/package.py @@ -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('hpx@1.3.0 cxxstd=14 build_type=Debug', when='backend=hpx +debug_backend') depends_on('hpx@1.3.0 cxxstd=14', when='backend=hpx') depends_on('boost@1.70.0: cxxstd=14 +program_options') diff --git a/spack-repo/packages/legion/package.py b/spack-repo/packages/legion/package.py index 7416becff..75daa65ef 100644 --- a/spack-repo/packages/legion/package.py +++ b/spack-repo/packages/legion/package.py @@ -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')