diff options
| author | Mikael Simberg <mikael.simberg@iki.fi> | 2022-02-11 11:03:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 11:03:55 +0100 |
| commit | 389b24c4dce4762583ced2609b452b8b79687a0e (patch) | |
| tree | 96d520fde020fdf9d64b4edf0ab77a412bad6a3b | |
| parent | 6c47aa06fcd41680c5ce1a09f4dfd21248a561ec (diff) | |
| download | spack-389b24c4dce4762583ced2609b452b8b79687a0e.tar.gz spack-389b24c4dce4762583ced2609b452b8b79687a0e.tar.bz2 spack-389b24c4dce4762583ced2609b452b8b79687a0e.tar.xz spack-389b24c4dce4762583ced2609b452b8b79687a0e.zip | |
hpx: add conflict for Asio/CUDA (#27947)
* Add missing Asio versions from 1.16.0 to 1.21.0
* Add conflict for Asio/CUDA to HPX package
Co-authored-by: Mikael Simberg <mikael.simberg@iki.if>
| -rw-r--r-- | var/spack/repos/builtin/packages/asio/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hpx/package.py | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/asio/package.py b/var/spack/repos/builtin/packages/asio/package.py index 3498de3a05..babc5ed40b 100644 --- a/var/spack/repos/builtin/packages/asio/package.py +++ b/var/spack/repos/builtin/packages/asio/package.py @@ -16,11 +16,17 @@ class Asio(AutotoolsPackage): git = "https://github.com/chriskohlhoff/asio.git" maintainers = ["msimberg"] + version('1.21.0', sha256='5d2d2dcb7bfb39bff941cabbfc8c27ee322a495470bf0f3a7c5238648cf5e6a9') version('1.20.0', sha256='34a8f07be6f54e3753874d46ecfa9b7ab7051c4e3f67103c52a33dfddaea48e6') version('1.19.2', sha256='5ee191aee825dfb1325cbacf643d599b186de057c88464ea98f1bae5ba4ff47a') version('1.19.1', sha256='2555e0a29256de5c77d6a34b14faefd28c76555e094ba0371acb0b91d483520e') version('1.19.0', sha256='11bc0e22fcdfb3f0b77574ac33760a3592c0dac7e7eece7668b823c158243629') version('1.18.2', sha256='8d67133b89e0f8b212e9f82fdcf1c7b21a978d453811e2cd941c680e72c2ca32') + version('1.18.1', sha256='39c721b987b7a0d2fe2aee64310bd128cd8cc10f43481604d18cb2d8b342fd40') + version('1.18.0', sha256='820688d1e0387ff55194ae20036cbae0fb3c7d11b7c3f46492369723c01df96f') + version('1.17.0', sha256='46406a830f8334b3789e7352ed7309a39c7c30b685b0499d289eda4fd4ae2067') + version('1.16.1', sha256='e40bbd531530f08318b7c7d7e84e457176d8eae6f5ad2e3714dc27b9131ecd35') + version('1.16.0', sha256='c87410ea62de6245aa239b9ed2057edf01d7f66acc3f5e50add9a29343c87512') depends_on("autoconf", type="build") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 565e7053ed..0d4b310993 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -146,6 +146,10 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage): # Patches and one-off conflicts + # 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") + # Boost and HIP don't work together in certain versions: # https://github.com/boostorg/config/issues/392. Boost 1.78.0 and HPX 1.8.0 # both include a fix. |