diff options
| author | Mark Grondona <mark.grondona@gmail.com> | 2021-10-23 08:37:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 17:37:44 +0200 |
| commit | 7fee7a7ce1842a16d6bdfa8563480795ba0f6e9b (patch) | |
| tree | c1d51f7e8341bc5fd11b4d214dcc43660cd8636b /var/spack/repos/builtin/packages/flux-sched/package.py | |
| parent | 7380161ea6baa69b1889d935204ec97d5f777190 (diff) | |
| download | spack-7fee7a7ce1842a16d6bdfa8563480795ba0f6e9b.tar.gz spack-7fee7a7ce1842a16d6bdfa8563480795ba0f6e9b.tar.bz2 spack-7fee7a7ce1842a16d6bdfa8563480795ba0f6e9b.tar.xz spack-7fee7a7ce1842a16d6bdfa8563480795ba0f6e9b.zip | |
flux-core, -sched: update to latest versions, fix czmq build error (#26840)
* flux-core: fix compile error with czmq_containers
* Fix build with clang and gcc-11
Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
Diffstat (limited to 'var/spack/repos/builtin/packages/flux-sched/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/flux-sched/package.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 3d66e6f9e5..20ad0d714c 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -19,6 +19,7 @@ class FluxSched(AutotoolsPackage): maintainers = ['grondo'] version('master', branch='master') + version('0.19.0', sha256='8dffa8eaec95a81286f621639ef851c52dc4c562d365971233bbd91100c31ed2') version('0.18.0', sha256='a4d8a6444fdb7b857b26f47fdea57992b486c9522f4ff92d5a6f547d95b586ae') version('0.17.0', sha256='5acfcb757e2294a92eaa91be58ba9b42736b88b42d2937de4a78f4642b1c4933') version('0.16.0', sha256='08313976161c141b9b34e2d44d5a08d1b11302e22d60aeaf878eef84d4bd2884') @@ -52,6 +53,8 @@ class FluxSched(AutotoolsPackage): depends_on("flux-core@0.23.0:0.25", when='@0.15.0', type=('build', 'run', 'link')) depends_on("flux-core@0.26.0:", when='@0.16.0', type=('build', 'run', 'link')) depends_on("flux-core@0.28.0:", when='@0.17.0', type=('build', 'run', 'link')) + depends_on("flux-core@0.29.0:", when='@0.18.0', type=('build', 'run', 'link')) + depends_on("flux-core@0.30.0:", when='@0.19.0', type=('build', 'run', 'link')) depends_on("flux-core@master", when='@master', type=('build', 'run', 'link')) # Need autotools when building on master: @@ -100,10 +103,18 @@ class FluxSched(AutotoolsPackage): bash = which('bash') bash('./autogen.sh') + @when('@:0.19') + def patch(self): + """Fix build with clang@13 and gcc@11""" + filter_file('NULL', 'nullptr', 'resource/schema/sched_data.hpp') + filter_file('size_t', 'std::size_t', 'resource/planner/planner.h') + def configure_args(self): args = [] if self.spec.satisfies('@0.9.0:'): - args.append('CXXFLAGS=-Wno-maybe-uninitialized') + args.append('CXXFLAGS=-Wno-uninitialized') + if self.spec.satisfies('%clang@12:'): + args.append('CXXFLAGS=-Wno-defaulted-function-deleted') # flux-sched's ax_boost is sometimes weird about non-system locations # explicitly setting the path guarantees success args.append('--with-boost={0}'.format(self.spec['boost'].prefix)) |