From 82b1e0827ed295edb4555d98c11eeb845d5e801a Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Fri, 1 Mar 2024 16:08:54 -0800 Subject: [PATCH 1/4] update .gitmodules for testing --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f475b64..9f44449fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +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/AlexanderRichert-NOAA/spack + branch = zlibng [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From 254a93bfc1d0d7403952e3a979d98c0fe246f555 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Fri, 1 Mar 2024 16:10:36 -0800 Subject: [PATCH 2/4] move from zlib to zlib-ng --- configs/common/packages.yaml | 4 +--- spack | 2 +- spack-ext/repos/spack-stack/packages/base-env/package.py | 2 +- spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 3dc1f37cf..a6618fb4d 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -10,7 +10,7 @@ jpeg: [libjpeg-turbo] lapack: [openblas] yacc: [bison] - zlib-api: [zlib] + zlib-api: [zlib-ng] # # This version of awscli goes with py-pyyaml@5.4.1 awscli: @@ -275,8 +275,6 @@ version: ['1.2.0'] yafyaml: version: ['1.2.0'] - zlib: - version: ['1.2.13'] zstd: version: ['1.5.2'] variants: +programs diff --git a/spack b/spack index 8e40b08ee..4ed211661 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 8e40b08ee6e321181d6dd0c0c926e4f406d7fa85 +Subproject commit 4ed211661680a093829f04f93ee2a507139143e5 diff --git a/spack-ext/repos/spack-stack/packages/base-env/package.py b/spack-ext/repos/spack-stack/packages/base-env/package.py index 26ff56754..deec53e44 100644 --- a/spack-ext/repos/spack-stack/packages/base-env/package.py +++ b/spack-ext/repos/spack-stack/packages/base-env/package.py @@ -27,7 +27,7 @@ class BaseEnv(BundlePackage): depends_on("curl", type="run") # I/O - depends_on("zlib", type="run") + depends_on("zlib-api", type="run") depends_on("hdf5", type="run") depends_on("netcdf-c", type="run") depends_on("netcdf-fortran", type="run") diff --git a/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py b/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py index 8abcdb1ac..37a1e9d33 100644 --- a/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py +++ b/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py @@ -30,7 +30,7 @@ class UfsUtilsEnv(BundlePackage): depends_on("w3emc") depends_on("sigio") depends_on("sfcio") - depends_on("zlib") + depends_on("zlib-ng") depends_on("hdf5") depends_on("netcdf-c") depends_on("netcdf-fortran") From 744c296b85fc3dcb0c589194588a195f793894a1 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Mon, 4 Mar 2024 23:44:51 -0800 Subject: [PATCH 3/4] revert submodule pointer --- .gitmodules | 4 ++-- spack | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9f44449fd..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,8 @@ path = spack #url = https://github.com/spack/spack #branch = develop - url = https://github.com/AlexanderRichert-NOAA/spack - branch = zlibng + 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 4ed211661..b1f29d9c8 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 4ed211661680a093829f04f93ee2a507139143e5 +Subproject commit b1f29d9c8105f36390e6e8f0178ab6e6005b30d6 From ac06da436801b05c45763fb5fedc896b61645d4e Mon Sep 17 00:00:00 2001 From: Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:00:59 -0800 Subject: [PATCH 4/4] Update package.py --- spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py b/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py index 37a1e9d33..ea9129907 100644 --- a/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py +++ b/spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py @@ -30,7 +30,7 @@ class UfsUtilsEnv(BundlePackage): depends_on("w3emc") depends_on("sigio") depends_on("sfcio") - depends_on("zlib-ng") + depends_on("zlib-api") depends_on("hdf5") depends_on("netcdf-c") depends_on("netcdf-fortran")