From 879d622abc3712d5d2665e8bedb2cf88cb640a55 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 29 Apr 2026 05:26:44 -0600 Subject: [PATCH 1/3] Pin openssl for hercules / orion to a version matching system libs (#2009) Co-authored-by: Rick Grubin --- 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 d7d36fa79..bcadaeb7c 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 97dbd20c2..2532e1135 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 From c09eebfb820ad8165144d4f6c00a2bb2bd0d9ea9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 15 Jul 2026 13:46:27 -0600 Subject: [PATCH 2/3] Update .gitmodules and submodule ppinter for repos/builtin --- .gitmodules | 3 ++- repos/builtin | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..5a0991803 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,4 +5,5 @@ [submodule "repos/builtin"] path = repos/builtin url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + #branch = spack-stack-dev + branch = feature/spstdev_merge_rel21_2060715 diff --git a/repos/builtin b/repos/builtin index 6950df944..0b8826452 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 6950df94424f67cbc3d6b1090aee0c30228a1233 +Subproject commit 0b8826452771fb6d3e3df150e5267545b94bd96d From cad8d473c5b394bab1fba8d95bb343ab64db98ea Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 15 Jul 2026 17:53:13 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for repos/builtin --- .gitmodules | 3 +-- repos/builtin | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5a0991803..2f6cb0566 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,4 @@ [submodule "repos/builtin"] path = repos/builtin url = https://github.com/jcsda/spack-packages - #branch = spack-stack-dev - branch = feature/spstdev_merge_rel21_2060715 + branch = spack-stack-dev diff --git a/repos/builtin b/repos/builtin index 0b8826452..bbbf37da7 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 0b8826452771fb6d3e3df150e5267545b94bd96d +Subproject commit bbbf37da72cc057a4b7077d87de89415a7656851