From 29645ceba514e27c65dd07eac27b8deb240b22c1 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Thu, 10 Sep 2020 15:53:28 -0600 Subject: Adding Missing Versions for Flux-Sched/Flux-Core and Compiler Flags (#18612) * Checksummed New Flux Versions Checksummed new flux versions to let spack detect them * Added CXXFlags to build Flux-sched Added missing cxxflags to build flux-sched --- var/spack/repos/builtin/packages/flux-core/package.py | 3 +++ var/spack/repos/builtin/packages/flux-sched/package.py | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index cb53c0f8ad..adb34f2611 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -15,6 +15,9 @@ class FluxCore(AutotoolsPackage): git = "https://github.com/flux-framework/flux-core.git" version('master', branch='master') + version('0.19.0', sha256='f45328a37d989c308c46639a9ed771f47b11184422cf5604249919fbd320d6f5') + version('0.18.0', sha256='9784bbca94177a32dbbc99728e8925bf894f3aebaa316961d6ea85df32d59545') + version('0.17.0', sha256='3f8c6cb72982028f86a96c0098cacd3a6e9de359fa1cf077380c835a20e7b7f7') version('0.16.0', sha256='1582f7fb4d2313127418c34de7c9ce4f5fef00622d19cedca7bed929f4709f10') version('0.15.0', sha256='51bc2eae69501f802459fc82f191eb5e8ae0b4f7e9e77ac18543a850cc8445f5') version('0.11.3', sha256='91b5d7dca8fc28a77777c4e4cb8717fc3dc2c174e70611740689a71901c6de7e') diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 5c33d39a0d..99bbce3b52 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -15,6 +15,9 @@ class FluxSched(AutotoolsPackage): git = "https://github.com/flux-framework/flux-sched.git" version('master', branch='master') + version('0.11.0', sha256='6a0e3c0678f85da8724e5399b02be9686311c835617f6036235ef54b489cc336') + version('0.10.0', sha256='5944927774709b5f52ddf64a0e825d9b0f24c9dea890b5504b87a8576d217cf6') + version('0.9.0', sha256='0e1eb408a937c2843bdaaed915d4d7e2ea763b98c31e7b849a96a74758d66a21') version('0.8.0', sha256='45bc3cefb453d19c0cb289f03692fba600a39045846568d258e4b896ca19ca0d') version('0.7.1', sha256='a35e555a353feed6b7b814ae83d05362356f9ee33ffa75d7dfb7e2fe86c21294') version('0.7.0', sha256='69267a3aaacaedd9896fd90cfe17aef266cba4fb28c77f8123d95a31ce739a7b') @@ -92,9 +95,13 @@ class FluxSched(AutotoolsPackage): bash('./autogen.sh') def configure_args(self): + args = [] + if self.spec.satisfies('@0.9.0:'): + args.append('CXXFLAGS=-Wno-maybe-uninitialized') # flux-sched's ax_boost is sometimes weird about non-system locations # explicitly setting the path guarantees success - return ['--with-boost={0}'.format(self.spec['boost'].prefix)] + args.append('--with-boost={0}'.format(self.spec['boost'].prefix)) + return args @property def lua_version(self): -- cgit v1.2.3-70-g09d2