From d399619c95e1f3d523c6d0dcd9bcf292a0fbc5b4 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Thu, 6 Jun 2024 22:23:55 +0000 Subject: [PATCH 1/7] Update spack submodule url to point to rickgrubin-noaa fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..72af82e03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack + url = https://github.com/rickgrubin-noaa/spack branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules From 8b0ca460666a63d4ac8315260e1a785532a437b8 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Fri, 7 Jun 2024 08:34:17 -0600 Subject: [PATCH 2/7] Update .gitmodules Remove spurious tab --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 72af82e03..241d94a69 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "spack"] path = spack - url = https://github.com/rickgrubin-noaa/spack + url = https://github.com/rickgrubin-noaa/spack branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules From c8cabc6b252943419fc153a00e9de2ade3bf6e1b Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 7 Aug 2024 23:16:56 +0000 Subject: [PATCH 3/7] update spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 642300875..5d06b616e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 642300875b30056d530f63e9a620428fda00f301 +Subproject commit 5d06b616e417d26f1ae638cbe7885094a15f00ea From b01db63f9c36fd671d58a8e18e8bbcae0d4a34c1 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Tue, 22 Apr 2025 11:24:39 -0500 Subject: [PATCH 4/7] set spack point to JCSDA --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 241d94a69..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "spack"] path = spack - url = https://github.com/rickgrubin-noaa/spack + url = https://github.com/jcsda/spack branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules From 68fad26071167514c5f431f0e3958e220fca3433 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Tue, 12 Aug 2025 11:45:53 -0500 Subject: [PATCH 5/7] update spack submodule pointer --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 43381fe76..e5820edc4 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 43381fe761f7280ac91fbdda462f86a062979843 +Subproject commit e5820edc45514037d68700fcb3af346f993bd80e From 244f947a187accac900b9dc612b077697383be8f Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Mon, 25 Aug 2025 15:58:45 -0500 Subject: [PATCH 6/7] update spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index e4724c3d7..b3fad4c1c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e4724c3d7952434f55f95b45a2276dec03c92949 +Subproject commit b3fad4c1c4803a83aa9cd2161003833ca721cf21 From 95ba23c44ce89476b5b5d49ca589f3db8906fee4 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Tue, 28 Apr 2026 17:00:06 -0500 Subject: [PATCH 7/7] Pin openssl for hercules / orion to a version matching system libs --- configs/sites/tier1/hercules/packages.yaml | 7 +++++++ configs/sites/tier1/orion/packages.yaml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml index 823efda8e..f9d7e1569 100644 --- a/configs/sites/tier1/hercules/packages.yaml +++ b/configs/sites/tier1/hercules/packages.yaml @@ -17,6 +17,13 @@ packages: prefix: /apps/spack-managed/gcc-11.3.1/zlib-1.2.13-ltp4c3zzde3zi3gf7x4b7c7nj5ww4i4g modules: - zlib/1.2.13 + + # https://github.com/JCSDA/spack-stack/issues/1892 + openssl: + require: + - +shared + - '@3.0.16' + autoconf: externals: - spec: autoconf@2.69 diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml index f588f1b78..15590a261 100644 --- a/configs/sites/tier1/orion/packages.yaml +++ b/configs/sites/tier1/orion/packages.yaml @@ -17,6 +17,13 @@ packages: prefix: /apps/spack-managed/gcc-11.3.1/zlib-1.2.13-ltp4c3zzde3zi3gf7x4b7c7nj5ww4i4g modules: - zlib/1.2.13 + + # https://github.com/JCSDA/spack-stack/issues/1892 + openssl: + require: + - +shared + - '@3.0.16' + autoconf: externals: - spec: autoconf@2.69