From 145b0667cc9ae970df5c182c9c68d9b126132e0a Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Wed, 26 Mar 2025 14:01:01 +0100 Subject: [PATCH] asio: add 1.34.0 (#49529) --- var/spack/repos/builtin/packages/asio/package.py | 1 + var/spack/repos/builtin/packages/hpx/package.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/var/spack/repos/builtin/packages/asio/package.py b/var/spack/repos/builtin/packages/asio/package.py index b13b6577ab5..eb831b8afba 100644 --- a/var/spack/repos/builtin/packages/asio/package.py +++ b/var/spack/repos/builtin/packages/asio/package.py @@ -18,6 +18,7 @@ class Asio(AutotoolsPackage): license("BSL-1.0") # As uneven minor versions of asio are not considered stable, they wont be added anymore + version("1.34.0", sha256="061ed6c8b97527756aed3e34d2cbcbcb6d3c80afd26ed6304f51119e1ef6a1cd") version("1.32.0", sha256="f1b94b80eeb00bb63a3c8cef5047d4e409df4d8a3fe502305976965827d95672") version("1.30.2", sha256="755bd7f85a4b269c67ae0ea254907c078d408cce8e1a352ad2ed664d233780e8") version("1.30.1", sha256="94b121cc2016680f2314ef58eadf169c2d34fff97fba01df325a192d502d3a58") diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 562072197fc..5a7f3429721 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -169,6 +169,10 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage): # Patches and one-off conflicts + # Asio 1.34.0 removed io_context::work, used by HPX: + # https://github.com/chriskohlhoff/asio/commit/a70f2df321ff40c1809773c2c09986745abf8d20. + conflicts("^asio@1.34:", when="@:1.10") + # Certain Asio headers don't compile with nvcc from 1.17.0 onwards with # C++17. Starting with CUDA 11.3 they compile again. conflicts("^asio@1.17.0:", when="+cuda cxxstd=17 ^cuda@:11.2")