From c40139b7d6fb2a233119ee292c920718554d3f64 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 13 Jan 2025 08:40:49 +0100 Subject: [PATCH] builtin: fix pkgconfig dependencies (#48533) `pkgconfig` is the virtual dependency, `pkg-config` and `pkgconf` are implementations. --- var/spack/repos/builtin/packages/bigdft-chess/package.py | 2 +- var/spack/repos/builtin/packages/bigdft-core/package.py | 2 +- var/spack/repos/builtin/packages/bigdft-psolver/package.py | 2 +- var/spack/repos/builtin/packages/bigdft-spred/package.py | 2 +- var/spack/repos/builtin/packages/cgsi-gsoap/package.py | 2 +- var/spack/repos/builtin/packages/gocryptfs/package.py | 2 +- var/spack/repos/builtin/packages/psrdada/package.py | 2 +- var/spack/repos/builtin/packages/typst/package.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/bigdft-chess/package.py b/var/spack/repos/builtin/packages/bigdft-chess/package.py index b4493543eb9..cd62c2baee3 100644 --- a/var/spack/repos/builtin/packages/bigdft-chess/package.py +++ b/var/spack/repos/builtin/packages/bigdft-chess/package.py @@ -37,7 +37,7 @@ class BigdftChess(AutotoolsPackage, CudaPackage): depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("python@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/bigdft-core/package.py b/var/spack/repos/builtin/packages/bigdft-core/package.py index 0ca3e317960..2c08dfd6deb 100644 --- a/var/spack/repos/builtin/packages/bigdft-core/package.py +++ b/var/spack/repos/builtin/packages/bigdft-core/package.py @@ -36,7 +36,7 @@ class BigdftCore(AutotoolsPackage, CudaPackage): depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("python@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/bigdft-psolver/package.py b/var/spack/repos/builtin/packages/bigdft-psolver/package.py index 2f81f1e3751..77bf7a17cf5 100644 --- a/var/spack/repos/builtin/packages/bigdft-psolver/package.py +++ b/var/spack/repos/builtin/packages/bigdft-psolver/package.py @@ -35,7 +35,7 @@ class BigdftPsolver(AutotoolsPackage, CudaPackage): depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("python@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/bigdft-spred/package.py b/var/spack/repos/builtin/packages/bigdft-spred/package.py index 0252effb992..945ad7ee835 100644 --- a/var/spack/repos/builtin/packages/bigdft-spred/package.py +++ b/var/spack/repos/builtin/packages/bigdft-spred/package.py @@ -28,7 +28,7 @@ class BigdftSpred(AutotoolsPackage): depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") diff --git a/var/spack/repos/builtin/packages/cgsi-gsoap/package.py b/var/spack/repos/builtin/packages/cgsi-gsoap/package.py index 8df642351b5..be630cd0723 100644 --- a/var/spack/repos/builtin/packages/cgsi-gsoap/package.py +++ b/var/spack/repos/builtin/packages/cgsi-gsoap/package.py @@ -20,7 +20,7 @@ class CgsiGsoap(CMakePackage): depends_on("c", type="build") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("gsoap") depends_on("voms") depends_on("globus-common") diff --git a/var/spack/repos/builtin/packages/gocryptfs/package.py b/var/spack/repos/builtin/packages/gocryptfs/package.py index efe59f06ab7..e43ec317320 100644 --- a/var/spack/repos/builtin/packages/gocryptfs/package.py +++ b/var/spack/repos/builtin/packages/gocryptfs/package.py @@ -22,4 +22,4 @@ class Gocryptfs(GoPackage): depends_on("c", type="build") # generated depends_on("openssl") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/psrdada/package.py b/var/spack/repos/builtin/packages/psrdada/package.py index d92f5f27112..e95c7777ba6 100644 --- a/var/spack/repos/builtin/packages/psrdada/package.py +++ b/var/spack/repos/builtin/packages/psrdada/package.py @@ -25,7 +25,7 @@ class Psrdada(AutotoolsPackage, CudaPackage): depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("nasm", type="build") - depends_on("pkgconf", type="build") + depends_on("pkgconfig", type="build") depends_on("fftw@3.3:", type="build") depends_on("python") depends_on("cuda", type="build") diff --git a/var/spack/repos/builtin/packages/typst/package.py b/var/spack/repos/builtin/packages/typst/package.py index 6cd17f02b3b..0d7dd1bcf6e 100644 --- a/var/spack/repos/builtin/packages/typst/package.py +++ b/var/spack/repos/builtin/packages/typst/package.py @@ -22,7 +22,7 @@ class Typst(CargoPackage): depends_on("rust@1.81.0:") depends_on("openssl") - depends_on("pkgconf", type="build") + depends_on("pkgconfig", type="build") @classmethod def determine_version(cls, exe):