Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move from zlib to zlib-ng #1016

Merged
merged 4 commits into from
Mar 5, 2024
Merged

Move from zlib to zlib-ng #1016

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82b1e08
update .gitmodules for testing
AlexanderRichert-NOAA Mar 2, 2024
254a93b
move from zlib to zlib-ng
AlexanderRichert-NOAA Mar 2, 2024
744c296
revert submodule pointer
AlexanderRichert-NOAA Mar 5, 2024
ac06da4
Update package.py
AlexanderRichert-NOAA Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
climbfuji marked this conversation as resolved.
Show resolved Hide resolved
branch = zlibng
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
4 changes: 1 addition & 3 deletions configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 1 files
+3 −3 var/spack/repos/builtin/packages/py-pyhdf/package.py
2 changes: 1 addition & 1 deletion spack-ext/repos/spack-stack/packages/base-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class UfsUtilsEnv(BundlePackage):
depends_on("w3emc")
depends_on("sigio")
depends_on("sfcio")
depends_on("zlib")
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
depends_on("zlib-ng")
depends_on("hdf5")
depends_on("netcdf-c")
depends_on("netcdf-fortran")
Expand Down
Loading