From b878fe55555238154af8d1f4aa403520251851ae Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 13 Jan 2025 11:19:30 -0600 Subject: [PATCH] boost: add v1.87.0, update depdendents' constraints (#48475) * boost: add 1.87.0 * boost: revert addition of parser variant * precice: forward compatibility boost@:1.86 when @:3.1.2 * faodel: forward compatibility boost@:1.86 when @:1.2108.1 * boost: conflicts ~python when +mpi @1.87.0: --- var/spack/repos/builtin/packages/boost/package.py | 12 ++++++++++++ var/spack/repos/builtin/packages/faodel/package.py | 1 + var/spack/repos/builtin/packages/precice/package.py | 1 + 3 files changed, 14 insertions(+) diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index d968e832834..640ad542052 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -29,6 +29,7 @@ class Boost(Package): license("BSL-1.0") version("develop", branch="develop", submodules=True) + version("1.87.0", sha256="af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89") version("1.86.0", sha256="1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b") version("1.85.0", sha256="7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617") version("1.84.0", sha256="cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454") @@ -287,6 +288,9 @@ def libs(self): # boost-python in 1.72.0 broken with cxxstd=98 conflicts("cxxstd=98", when="+mpi+python @1.72.0") + # boost-mpi depends on boost-python since 1.87.0 + conflicts("~python", when="+mpi @1.87.0:") + # Container's Extended Allocators were not added until 1.56.0 conflicts("+container", when="@:1.55") @@ -440,6 +444,14 @@ def libs(self): when="@1.82.0 platform=windows", ) + # https://github.com/boostorg/context/pull/280 + patch( + "https://github.com/boostorg/context/commit/d11cbccc87da5d6d41c04f3949e18d49c43e62fc.patch?full_index=1", + sha256="e2d37f9e35e8e238977de9af32604a8e1c2648d153df1d568935a20216b5c67f", + when="@1.87.0", + working_dir="libs/context", + ) + def patch(self): # Disable SSSE3 and AVX2 when using the NVIDIA compiler if self.spec.satisfies("%nvhpc"): diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py index b78977d2711..9356e5248f0 100644 --- a/var/spack/repos/builtin/packages/faodel/package.py +++ b/var/spack/repos/builtin/packages/faodel/package.py @@ -64,6 +64,7 @@ class Faodel(CMakePackage): "+program_options+exception+locale+system+chrono+log+serialization" "+atomic+container+regex+thread+date_time" ) + depends_on("boost@:1.86", when="@:1.2108.1") depends_on("cmake@3.8.0:", type="build") depends_on("hdf5+mpi", when="+hdf5+mpi") depends_on("hdf5~mpi", when="+hdf5~mpi") diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index 2b9e8512111..539fcfdd8a0 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -92,6 +92,7 @@ class Precice(CMakePackage): depends_on("boost@:1.72", when="@:2.0.2") depends_on("boost@:1.74", when="@:2.1.1") depends_on("boost@:1.78", when="@:2.3.0") + depends_on("boost@:1.86", when="@:3.1.2") depends_on("eigen@3.2:") depends_on("eigen@3.4:", when="@3.2:")