From b481b5114a5be775d2b5ae2ba36c01e59193f167 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sun, 24 Oct 2021 20:39:50 +0200 Subject: Fix pkg-config dependencies (#26912) pkg-config and pkgconf are implementations of the pkgconfig provider. --- var/spack/repos/builtin/packages/diffmark/package.py | 2 +- var/spack/repos/builtin/packages/dtc/package.py | 2 +- var/spack/repos/builtin/packages/fgsl/package.py | 2 +- var/spack/repos/builtin/packages/fipscheck/package.py | 2 +- var/spack/repos/builtin/packages/libabigail/package.py | 2 +- var/spack/repos/builtin/packages/mpibind/package.py | 2 +- var/spack/repos/builtin/packages/nbdkit/package.py | 2 +- var/spack/repos/builtin/packages/uftrace/package.py | 2 +- var/spack/repos/builtin/packages/universal-ctags/package.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diffmark/package.py b/var/spack/repos/builtin/packages/diffmark/package.py index 281e7a7b60..5a7d07a638 100644 --- a/var/spack/repos/builtin/packages/diffmark/package.py +++ b/var/spack/repos/builtin/packages/diffmark/package.py @@ -18,5 +18,5 @@ class Diffmark(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/dtc/package.py b/var/spack/repos/builtin/packages/dtc/package.py index 96e00fcc52..de73952e45 100644 --- a/var/spack/repos/builtin/packages/dtc/package.py +++ b/var/spack/repos/builtin/packages/dtc/package.py @@ -21,7 +21,7 @@ class Dtc(MakefilePackage): # (convert-dtsv0-lexer.lex.c:398: error: "yywrap" redefined) depends_on('flex@2.6.4:', type='build') depends_on('libyaml', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('python', type='build') def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/fgsl/package.py b/var/spack/repos/builtin/packages/fgsl/package.py index 00e53f8195..0fe4c4a03d 100644 --- a/var/spack/repos/builtin/packages/fgsl/package.py +++ b/var/spack/repos/builtin/packages/fgsl/package.py @@ -24,7 +24,7 @@ class Fgsl(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('gsl@2.4', when='@1.3.0') depends_on('gsl@2.3', when='@1.2.0') depends_on('gsl@2.2.1', when='@1.1.0') diff --git a/var/spack/repos/builtin/packages/fipscheck/package.py b/var/spack/repos/builtin/packages/fipscheck/package.py index ef802e8664..ff01c94602 100644 --- a/var/spack/repos/builtin/packages/fipscheck/package.py +++ b/var/spack/repos/builtin/packages/fipscheck/package.py @@ -21,7 +21,7 @@ class Fipscheck(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') def autoreconf(self, spec, prefix): bash = which('bash') diff --git a/var/spack/repos/builtin/packages/libabigail/package.py b/var/spack/repos/builtin/packages/libabigail/package.py index bb2195fa00..03cb3310fc 100644 --- a/var/spack/repos/builtin/packages/libabigail/package.py +++ b/var/spack/repos/builtin/packages/libabigail/package.py @@ -30,7 +30,7 @@ class Libabigail(AutotoolsPackage): depends_on('python@3.8:') # Will not find libxml without this - depends_on('pkgconf') + depends_on('pkgconfig', type='build') # Documentation dependencies depends_on('doxygen', type="build", when="+docs") diff --git a/var/spack/repos/builtin/packages/mpibind/package.py b/var/spack/repos/builtin/packages/mpibind/package.py index 7c023e0964..d1bb6a77e9 100644 --- a/var/spack/repos/builtin/packages/mpibind/package.py +++ b/var/spack/repos/builtin/packages/mpibind/package.py @@ -35,7 +35,7 @@ class Mpibind(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('pkgconf', type='build') + depends_on('pkgconfig', type='build') depends_on('hwloc@2:+libxml2', type='link') depends_on('hwloc@2:+pci', when=(sys.platform != 'darwin'), type='link') diff --git a/var/spack/repos/builtin/packages/nbdkit/package.py b/var/spack/repos/builtin/packages/nbdkit/package.py index 9c8afaf88a..47028df96e 100644 --- a/var/spack/repos/builtin/packages/nbdkit/package.py +++ b/var/spack/repos/builtin/packages/nbdkit/package.py @@ -24,7 +24,7 @@ class Nbdkit(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') def configure_args(self): args = ['bashcompdir={0}'.format(prefix)] diff --git a/var/spack/repos/builtin/packages/uftrace/package.py b/var/spack/repos/builtin/packages/uftrace/package.py index a20b297539..80bf30e5cd 100644 --- a/var/spack/repos/builtin/packages/uftrace/package.py +++ b/var/spack/repos/builtin/packages/uftrace/package.py @@ -31,7 +31,7 @@ class Uftrace(AutotoolsPackage): depends_on('capstone') depends_on('elfutils') depends_on('lsof', type='test') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('libunwind') depends_on('ncurses') depends_on('python@2.7:', when='+python2') diff --git a/var/spack/repos/builtin/packages/universal-ctags/package.py b/var/spack/repos/builtin/packages/universal-ctags/package.py index 01925e034a..2a7473e6ff 100644 --- a/var/spack/repos/builtin/packages/universal-ctags/package.py +++ b/var/spack/repos/builtin/packages/universal-ctags/package.py @@ -25,4 +25,4 @@ class UniversalCtags(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') depends_on('libiconv', type='link') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') -- cgit v1.2.3-60-g2f50