From c55dff8ba4f2f21033747a0cd18048ab12691c69 Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Thu, 16 Nov 2023 10:19:58 -0700 Subject: [PATCH 1/2] Add Boost version 1.83.0 --- .gitmodules | 6 ++++-- configs/common/packages.yaml | 2 +- spack | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f475b64..545903845 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,10 @@ path = spack #url = https://github.com/spack/spack #branch = develop - url = https://github.com/jcsda/spack - branch = jcsda_emc_spack_stack + #url = https://github.com/jcsda/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/srherbener/spack + branch = feature/add-boost-1.83.0 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index d68b16614..176797c21 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -19,7 +19,7 @@ bison: version: ['3.8.2'] boost: - version: ['1.78.0'] + version: ['1.83.0'] variants: ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden bufr: version: ['12.0.1'] diff --git a/spack b/spack index 4ac3371a1..15ed5f5c8 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 4ac3371a1274e79f7d83e26cfd755a14ac9f628a +Subproject commit 15ed5f5c89da66e76c5a522d273d1cc93495a755 From 4a601262b5708d7cbfee7c637ae0dc1d0a0bd0ff Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Fri, 17 Nov 2023 09:36:59 -0700 Subject: [PATCH 2/2] Updated spack submodule hash and restored .gitmodules --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 545903845..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,8 @@ path = spack #url = https://github.com/spack/spack #branch = develop - #url = https://github.com/jcsda/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/srherbener/spack - branch = feature/add-boost-1.83.0 + url = https://github.com/jcsda/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 15ed5f5c8..5cdb7cee4 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 15ed5f5c89da66e76c5a522d273d1cc93495a755 +Subproject commit 5cdb7cee432093a0d8a65bc0f8883c55f5bf3172