From b6ad9848d295d65a4afbe8b2b26285ed0e4039ae Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Tue, 12 Oct 2021 21:45:00 +0200 Subject: babelflow, parallelmergetree: fix build with gcc11 (#26681) gcc-11 does not include the and as side effect of including other header, at least not as often as earlier gcc did. --- var/spack/repos/builtin/packages/babelflow/package.py | 5 +++++ var/spack/repos/builtin/packages/parallelmergetree/package.py | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/babelflow/package.py b/var/spack/repos/builtin/packages/babelflow/package.py index 701ce90819..276c35fe40 100644 --- a/var/spack/repos/builtin/packages/babelflow/package.py +++ b/var/spack/repos/builtin/packages/babelflow/package.py @@ -25,6 +25,11 @@ class Babelflow(CMakePackage): variant("shared", default=True, description="Build Babelflow as shared libs") + # The C++ headers of gcc-11 don't provide as side effect of others + @when('%gcc@11:') + def setup_build_environment(self, env): + env.append_flags('CXXFLAGS', '-include limits') + def cmake_args(self): args = [self.define_from_variant('BUILD_SHARED_LIBS', 'shared')] return args diff --git a/var/spack/repos/builtin/packages/parallelmergetree/package.py b/var/spack/repos/builtin/packages/parallelmergetree/package.py index 4243e5cae4..d3aae9c468 100644 --- a/var/spack/repos/builtin/packages/parallelmergetree/package.py +++ b/var/spack/repos/builtin/packages/parallelmergetree/package.py @@ -37,6 +37,11 @@ class Parallelmergetree(CMakePackage): variant("shared", default=True, description="Build ParallelMergeTree as shared libs") + # The C++ headers of gcc-11 don't provide as side effect of others + @when('%gcc@11:') + def setup_build_environment(self, env): + env.append_flags('CXXFLAGS', '-include algorithm') + def cmake_args(self): args = [] -- cgit v1.2.3-60-g2f50