zlib-ng~shared for hera when %intel

JCSDA · Mar 28, 2024 · 005aa67 · 005aa67
1 parent f58a638
commit 005aa67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "spack"]
   path = spack
-  url = https://github.com/jcsda/spack
-  branch = release/1.7.0
+  url = https://github.com/AlexanderRichert-NOAA/spack
+  branch = zlib-shared
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

diff --git a/configs/sites/hera/compilers.yaml b/configs/sites/hera/compilers.yaml
@@ -7,7 +7,7 @@ compilers:
       f77: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
       fc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
     flags: {}
-    operating_system: centos7
+    operating_system: rocky8
     modules:
     - intel/2022.1.2
     environment:
@@ -24,7 +24,7 @@ compilers:
       f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
       fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
     flags: {}
-    operating_system: centos7
+    operating_system: rocky8
     modules:
     - intel/18.0.5.274
 - compiler:
@@ -35,7 +35,7 @@ compilers:
       f77: /apps/gnu/gcc-9.2.0/bin/gfortran
       fc:  /apps/gnu/gcc-9.2.0/bin/gfortran
     flags: {}
-    operating_system: centos7
+    operating_system: rocky8
     modules:
     - gnu/9.2.0
     environment: {}

diff --git a/configs/sites/hera/packages.yaml b/configs/sites/hera/packages.yaml
@@ -27,6 +27,10 @@ packages:
       modules:
       - gnu/9.2.0
       - openmpi/4.1.5
+  zlib-ng:
+    require:
+      - any_of: ['~shared']
+        when: "%intel"
 
 ### All other external packages listed alphabetically
   autoconf: