From 33b129b919777623670d05592a8fc9704c02e1ee Mon Sep 17 00:00:00 2001
From: Tim Haines <thaines.astro@gmail.com>
Date: Tue, 5 May 2020 08:26:11 -0500
Subject: Boost: Add version 1.73.0 (#16442)

---
 var/spack/repos/builtin/packages/boost/package.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 7baff3f28c..aa4768e954 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -25,6 +25,7 @@ class Boost(Package):
     maintainers = ['hainest']
 
     version('develop', branch='develop', submodules=True)
+    version('1.73.0', sha256='4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402')
     version('1.72.0', sha256='59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722')
     version('1.71.0', sha256='d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee')
     version('1.70.0', sha256='430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778')
@@ -125,7 +126,7 @@ class Boost(Package):
 
     variant('cxxstd',
             default='98',
-            values=('98', '11', '14', '17'),
+            values=('98', '11', '14', '17', '2a'),
             multi=False,
             description='Use the specified C++ standard when building.')
     variant('debug', default=False,
@@ -172,6 +173,9 @@ class Boost(Package):
     conflicts('cxxstd=98', when='+fiber')  # Fiber requires >=C++11.
     conflicts('~context', when='+fiber')  # Fiber requires Context.
 
+    # C++20/2a is not support by Boost < 1.73.0
+    conflicts('cxxstd=2a', when='@:1.72.99')
+
     # C++17 is not supported by Boost<1.63.0.
     conflicts('cxxstd=17', when='@:1.62.99')
 
@@ -231,6 +235,18 @@ class Boost(Package):
     patch('clang-linux_add_option.patch', when='@1.56.0:1.63.0')
     patch('clang-linux_add_option2.patch', when='@1.47.0:1.55.0')
 
+    # C++20 concepts fix for Beast
+    # See https://github.com/boostorg/beast/pull/1927 for details
+    patch('https://www.boost.org/patches/1_73_0/0002-beast-coroutines.patch',
+          sha256='4dd507e1f5a29e3b87b15321a4d8c74afdc8331433edabf7aeab89b3c405d556',
+          when='@1.73.0')
+
+    # Cloning a status_code with indirecting_domain leads to segmentation fault
+    # See https://github.com/ned14/outcome/issues/223 for details
+    patch('https://www.boost.org/patches/1_73_0/0001-outcome-assert.patch',
+          sha256='246508e052c44b6f4e8c2542a71c06cacaa72cd1447ab8d2a542b987bc35ace9',
+          when='@1.73.0')
+
     def url_for_version(self, version):
         if version >= Version('1.63.0'):
             url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2"
-- 
cgit v1.2.3-60-g2f50