summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@ovgu.de>2022-04-22 15:34:30 +0200
committerGitHub <noreply@github.com>2022-04-22 07:34:30 -0600
commit84bb8e316d8038c1c161b084426aed921a56b00d (patch)
tree0aceee54784d8b96d0cf0e3b65c34f5782e1b5ad
parent010068c50a2fbfda269dab2c2b41beaaf210b222 (diff)
downloadspack-84bb8e316d8038c1c161b084426aed921a56b00d.tar.gz
spack-84bb8e316d8038c1c161b084426aed921a56b00d.tar.bz2
spack-84bb8e316d8038c1c161b084426aed921a56b00d.tar.xz
spack-84bb8e316d8038c1c161b084426aed921a56b00d.zip
fix pkgconfig dependencies (#30246)
`pkgconfig` is the correct virtual dependency, `pkg-config` and `pkgconf` are providers of it.
-rw-r--r--var/spack/repos/builtin/packages/flux-pmix/package.py2
-rw-r--r--var/spack/repos/builtin/packages/gpi-space/package.py2
-rw-r--r--var/spack/repos/builtin/packages/hicops/package.py2
-rw-r--r--var/spack/repos/builtin/packages/man-db/package.py2
-rw-r--r--var/spack/repos/builtin/packages/neko/package.py10
5 files changed, 9 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/flux-pmix/package.py b/var/spack/repos/builtin/packages/flux-pmix/package.py
index 8b99ebedba..7d9e0808f0 100644
--- a/var/spack/repos/builtin/packages/flux-pmix/package.py
+++ b/var/spack/repos/builtin/packages/flux-pmix/package.py
@@ -24,7 +24,7 @@ class FluxPmix(AutotoolsPackage):
depends_on('pmix@v4.1.0:')
depends_on('openmpi')
- depends_on('pkg-config', type='build')
+ depends_on('pkgconfig', type='build')
depends_on('autoconf', type='build')
depends_on('automake', type='build')
depends_on('libtool', type='build')
diff --git a/var/spack/repos/builtin/packages/gpi-space/package.py b/var/spack/repos/builtin/packages/gpi-space/package.py
index ab329761b0..095fcf99ec 100644
--- a/var/spack/repos/builtin/packages/gpi-space/package.py
+++ b/var/spack/repos/builtin/packages/gpi-space/package.py
@@ -47,7 +47,7 @@ class GpiSpace(CMakePackage):
type="build")
depends_on("chrpath@0.13:",
type=("build", "run"))
- depends_on("pkgconf",
+ depends_on("pkgconfig",
type="build")
depends_on("boost@1.62.0:1.63.0 +atomic +chrono +coroutine +context +date_time +filesystem +iostreams +program_options +random +regex +serialization +test +timer cxxstd=14")
depends_on("hwloc@1.10: +libudev ~shared ~libxml2")
diff --git a/var/spack/repos/builtin/packages/hicops/package.py b/var/spack/repos/builtin/packages/hicops/package.py
index ccd52af0e0..136cb3ae37 100644
--- a/var/spack/repos/builtin/packages/hicops/package.py
+++ b/var/spack/repos/builtin/packages/hicops/package.py
@@ -79,7 +79,7 @@ class Hicops(CMakePackage):
depends_on('git', type='build', when='@release')
depends_on('git', type='build', when='@develop')
depends_on('cmake@3.11:', type='build')
- depends_on('pkgconf', type='build')
+ depends_on('pkgconfig', type='build')
# TODO: Add timemory and mpip depends_on()
conflicts('+timemory')
diff --git a/var/spack/repos/builtin/packages/man-db/package.py b/var/spack/repos/builtin/packages/man-db/package.py
index c91f494fac..c7249051d6 100644
--- a/var/spack/repos/builtin/packages/man-db/package.py
+++ b/var/spack/repos/builtin/packages/man-db/package.py
@@ -19,7 +19,7 @@ class ManDb(AutotoolsPackage):
version('2.10.1', sha256='2ffd8f2e80122fe72e60c740c851e6a3e15c9a7921185eb4752c1c672824bed6')
version('2.7.6.1', sha256='08edbc52f24aca3eebac429b5444efd48b9b90b9b84ca0ed5507e5c13ed10f3f')
- depends_on('pkgconf', type='build')
+ depends_on('pkgconfig', type='build')
depends_on('gettext')
depends_on('libpipeline@1.5.0:', when='@2.8.0:')
depends_on('libpipeline@1.4.0:', when='@2.7.1:')
diff --git a/var/spack/repos/builtin/packages/neko/package.py b/var/spack/repos/builtin/packages/neko/package.py
index 1216624fae..fe52daf938 100644
--- a/var/spack/repos/builtin/packages/neko/package.py
+++ b/var/spack/repos/builtin/packages/neko/package.py
@@ -20,11 +20,11 @@ class Neko(AutotoolsPackage, CudaPackage, ROCmPackage):
variant('parmetis', default=False, description='Build with support for parmetis')
variant('xsmm', default=False, description='Build with support for libxsmm')
- depends_on('autoconf', type='build')
- depends_on('automake', type='build')
- depends_on('libtool', type='build')
- depends_on('m4', type='build')
- depends_on('pkgconf', type='build')
+ depends_on('autoconf', type='build')
+ depends_on('automake', type='build')
+ depends_on('libtool', type='build')
+ depends_on('m4', type='build')
+ depends_on('pkgconfig', type='build')
depends_on('parmetis', when='+parmetis')
depends_on('libxsmm', when='+xsmm')
depends_on('mpi')