From 76e83e10c1113abfa08b1aef4055eb4bb3ab685e Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Wed, 12 Feb 2025 02:16:30 -0700 Subject: [PATCH] gmake: add empty libs property, remove link deptypes from dependents (#48995) --- var/spack/repos/builtin/packages/cmake/package.py | 6 +++--- var/spack/repos/builtin/packages/gmake/package.py | 4 ++++ var/spack/repos/builtin/packages/petsc/package.py | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 8304bb6aa79..a2b70d4eec3 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -125,9 +125,9 @@ class Cmake(Package): patch("mr-9623.patch", when="@3.22.0:3.30") depends_on("ninja", when="platform=windows") - depends_on("gmake", when="platform=linux") - depends_on("gmake", when="platform=darwin") - depends_on("gmake", when="platform=freebsd") + depends_on("gmake", type=("build", "run"), when="platform=linux") + depends_on("gmake", type=("build", "run"), when="platform=darwin") + depends_on("gmake", type=("build", "run"), when="platform=freebsd") depends_on("qt", when="+qtgui") # Qt depends on libmng, which is a CMake package; diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index ecc9b9ee7bc..40b566eabc9 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -99,3 +99,7 @@ def setup_dependent_package(self, module, dspec): self.spec.prefix.bin.make, jobs=determine_number_of_jobs(parallel=dspec.package.parallel), ) + + @property + def libs(self): + return [] diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 5ca7af8681f..61dfeb01bf0 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -335,8 +335,7 @@ def check_fortran_compiler(self): patch("revert-3.18.0-ver-format-for-dealii.patch", when="@3.18.0") depends_on("diffutils", type="build") - # not listed as a "build" dependency - so that slepc build gets the same dependency - depends_on("gmake") + depends_on("gmake", type="build") # Virtual dependencies # Git repository needs sowing to build Fortran interface