diff --git a/legacy/systems/LLNL-Dane-DELL-sapphirerapids-OmniPath/auxiliary_software_files/packages.yaml b/legacy/systems/LLNL-Dane-DELL-sapphirerapids-OmniPath/auxiliary_software_files/packages.yaml index 5898f0893..a3e168b27 100644 --- a/legacy/systems/LLNL-Dane-DELL-sapphirerapids-OmniPath/auxiliary_software_files/packages.yaml +++ b/legacy/systems/LLNL-Dane-DELL-sapphirerapids-OmniPath/auxiliary_software_files/packages.yaml @@ -48,6 +48,8 @@ packages: externals: - spec: fftw@3.3.10 prefix: /usr/tce/packages/fftw/fftw-3.3.10 + zlib-api: + require: zlib mpi: buildable: false externals: diff --git a/repo/laghos/package.py b/repo/laghos/package.py index 2c0c7d3b5..b472bc119 100644 --- a/repo/laghos/package.py +++ b/repo/laghos/package.py @@ -33,6 +33,7 @@ class Laghos(MakefilePackage): depends_on("caliper", when="+caliper") depends_on("adiak", when="+caliper") + depends_on("hypre~fortran", when="@develop") depends_on("zlib@1.3.1+optimize+pic+shared", when="@develop") depends_on("mfem@develop^zlib@1.3.1+optimize+pic+shared", when="@develop") depends_on("mfem@4.2.0:", when="@3.1") diff --git a/systems/genericx86/externals/base/00-packages.yaml b/systems/genericx86/externals/base/00-packages.yaml deleted file mode 100644 index 2c580f63c..000000000 --- a/systems/genericx86/externals/base/00-packages.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2023 Lawrence Livermore National Security, LLC and other -# Benchpark Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: Apache-2.0 - -packages: - zlib-api: - require: zlib diff --git a/systems/sierra/externals/base/00-packages.yaml b/systems/sierra/externals/base/00-packages.yaml index 278fa8a4b..fe22877ef 100644 --- a/systems/sierra/externals/base/00-packages.yaml +++ b/systems/sierra/externals/base/00-packages.yaml @@ -49,5 +49,3 @@ packages: buildable: false mpi: buildable: false - zlib-api: - require: zlib diff --git a/systems/tioga/compilers/rocm/00-rocm-551-compilers.yaml b/systems/tioga/compilers/rocm/00-rocm-551-compilers.yaml index 0952924cb..9185da69e 100644 --- a/systems/tioga/compilers/rocm/00-rocm-551-compilers.yaml +++ b/systems/tioga/compilers/rocm/00-rocm-551-compilers.yaml @@ -15,6 +15,7 @@ compilers: cflags: -g -O2 cxxflags: -g -O2 -std=c++17 fflags: -g -O2 -hnopattern + ldflags: -ldl operating_system: rhel8 target: x86_64 modules: [] diff --git a/systems/tioga/externals/base/00-packages.yaml b/systems/tioga/externals/base/00-packages.yaml index fa5bef4c1..868a3d3d1 100644 --- a/systems/tioga/externals/base/00-packages.yaml +++ b/systems/tioga/externals/base/00-packages.yaml @@ -183,5 +183,3 @@ packages: buildable: false rocsolver: buildable: false - zlib-api: - require: zlib