diff options
| author | Michael Kuhn <michael.kuhn@ovgu.de> | 2024-04-15 16:05:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-15 16:05:11 +0200 |
| commit | 057603cad8898bd7c1f0ccf334b1c07e6f7275fd (patch) | |
| tree | f5cdd5dedfb3dabde3d6eb7c1c97457928e50168 | |
| parent | 5b8b6e492d2c2ce1280aaae36d10c0b47a15b2ab (diff) | |
| download | spack-057603cad8898bd7c1f0ccf334b1c07e6f7275fd.tar.gz spack-057603cad8898bd7c1f0ccf334b1c07e6f7275fd.tar.bz2 spack-057603cad8898bd7c1f0ccf334b1c07e6f7275fd.tar.xz spack-057603cad8898bd7c1f0ccf334b1c07e6f7275fd.zip | |
Fix pkgconfig dependencies (#43651)
pkgconfig is the virtual package, pkg-config and pkgconf are
implementations.
| -rw-r--r-- | var/spack/repos/builtin/packages/charliecloud/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hpctoolkit/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/yosys/package.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index d7aa09dd35..45a6e33810 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -112,7 +112,7 @@ class Charliecloud(AutotoolsPackage): depends_on("libtool", type="build") # pkg-config is required for 0.36 regardless of variant. - depends_on("pkg-config", type="build", when="@0.36") + depends_on("pkgconfig", type="build", when="@0.36") # Image manipulation. depends_on("python@3.6:", type="run") @@ -146,7 +146,7 @@ class Charliecloud(AutotoolsPackage): # approach with squashfuse could implemented in a different variant. with when("+squashfuse"): depends_on("libfuse@3:", type=("build", "run", "link"), when="@0.32:") - depends_on("pkg-config", type="build", when="@0.37:") + depends_on("pkgconfig", type="build", when="@0.37:") depends_on("squashfuse@0.1.105:0.2.0,0.4.0:", type="build", when="@0.36:") depends_on("squashfuse@0.1.105:0.2.0,0.4.0", type="build", when="@0.35") depends_on("squashfuse@0.1.105", type="build", when="@0.32:0.34") diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 97514dc7a9..f57afcbaf8 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -143,7 +143,7 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage): depends_on("libtool", type="build") with when("@2024.02:"): - depends_on("pkgconf", type="build") + depends_on("pkgconfig", type="build") depends_on("cmake", type="build") boost_libs = ( diff --git a/var/spack/repos/builtin/packages/yosys/package.py b/var/spack/repos/builtin/packages/yosys/package.py index cf56daa36f..072ff29705 100644 --- a/var/spack/repos/builtin/packages/yosys/package.py +++ b/var/spack/repos/builtin/packages/yosys/package.py @@ -59,7 +59,7 @@ class Yosys(MakefilePackage): depends_on("bison") depends_on("libffi") depends_on("readline") - depends_on("pkg-config") + depends_on("pkgconfig") depends_on("tcl") depends_on("zlib") depends_on("llvm") |