diff options
| author | Mikael Simberg <mikael.simberg@iki.fi> | 2022-10-20 22:32:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 13:32:25 -0700 |
| commit | ee721f9c91a614b6dc6bacd3070f50cfeac97015 (patch) | |
| tree | a0892454e67e0ef0f2ba4e6743cfe7fa04067c26 /var | |
| parent | e981ab9b6555bf8cd56a0528325b3477aca64793 (diff) | |
| download | spack-ee721f9c91a614b6dc6bacd3070f50cfeac97015.tar.gz spack-ee721f9c91a614b6dc6bacd3070f50cfeac97015.tar.bz2 spack-ee721f9c91a614b6dc6bacd3070f50cfeac97015.tar.xz spack-ee721f9c91a614b6dc6bacd3070f50cfeac97015.zip | |
Add Boost 1.80.0 (#32879)
* Add Boost 1.80.0
* Add conflict for Boost 1.80.0 and dealii
* Add conflict for Boost 1.80 and %oneapi
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 4e2c05ada3..a57b2e5bac 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -27,6 +27,7 @@ class Boost(Package): maintainers = ["hainest"] version("develop", branch="develop", submodules=True) + version("1.80.0", sha256="1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0") version("1.79.0", sha256="475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39") version("1.78.0", sha256="8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc") version("1.77.0", sha256="fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854") @@ -261,6 +262,10 @@ class Boost(Package): # https://github.com/STEllAR-GROUP/hpx/issues/5442#issuecomment-878913339 conflicts("%gcc", when="@:1.76 +system platform=darwin") + # Boost 1.80 does not build with the Intel oneapi compiler + # (https://github.com/spack/spack/pull/32879#issuecomment-1265933265) + conflicts("%oneapi", when="@1.80") + # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch("boost_11856.patch", when="@1.60.0%gcc@4.4.7") diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 222691c69e..902e310be6 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -106,8 +106,11 @@ class Dealii(CMakePackage, CudaPackage): # more precisely its variation https://github.com/dealii/dealii/pull/5572#issuecomment-349742019 # 1.68.0 has issues with serialization https://github.com/dealii/dealii/issues/7074 # adopt https://github.com/boostorg/serialization/pull/105 as a fix + # + # dealii does not build with Boost 1.80.0 + # (https://github.com/spack/spack/pull/32879#issuecomment-1265933265) depends_on( - "boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams", + "boost@1.59.0:1.63,1.65.1,1.67.0:1.79+thread+system+serialization+iostreams", patches=[ patch("boost_1.65.1_singleton.patch", level=1, when="@1.65.1"), patch("boost_1.68.0.patch", level=1, when="@1.68.0"), @@ -115,7 +118,7 @@ class Dealii(CMakePackage, CudaPackage): when="~python", ) depends_on( - "boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams+python", + "boost@1.59.0:1.63,1.65.1,1.67.0:1.79+thread+system+serialization+iostreams+python", patches=[ patch("boost_1.65.1_singleton.patch", level=1, when="@1.65.1"), patch("boost_1.68.0.patch", level=1, when="@1.68.0"), |