From 12fb1cdbe51a5fb66f4244752cc2ba68fec40320 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 2 Aug 2018 19:29:05 +0200 Subject: Replace pkg-config dependencies with virtual (#8783) Several packages specified pkg-config as a dependency, which is a specific implementation of the pkgconfig virtual. Most packages do not request a specific implementation. The current concretizer may choose a different implentation of pkgconfig for the nonspecific dependents, which conflicts with the request for pkg-config. This replaces all requests for a specific implementation of pkgconfig with the virtual package as a temporary solution to the issue. --- var/spack/repos/builtin/packages/fluxbox/package.py | 2 +- var/spack/repos/builtin/packages/gdal/package.py | 2 +- var/spack/repos/builtin/packages/graphviz/package.py | 2 +- var/spack/repos/builtin/packages/i3/package.py | 10 +++++----- var/spack/repos/builtin/packages/mc/package.py | 2 +- var/spack/repos/builtin/packages/neuron/package.py | 4 ++-- var/spack/repos/builtin/packages/pandaseq/package.py | 2 +- .../repos/builtin/packages/perl-extutils-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/wireshark/package.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py index 41c6e65d2f..f6474e576f 100644 --- a/var/spack/repos/builtin/packages/fluxbox/package.py +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -38,7 +38,7 @@ class Fluxbox(AutotoolsPackage): version('1.3.7', 'd99d7710f9daf793e0246dae5304b595') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('freetype') depends_on('libxrender') depends_on('libxext') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 996564f337..e49f473198 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -93,7 +93,7 @@ class Gdal(AutotoolsPackage): # GDAL depends on GNUmake on Unix platforms. # https://trac.osgeo.org/gdal/wiki/BuildingOnUnix depends_on('gmake', type='build') - depends_on('pkg-config@0.25:', type='build') + depends_on('pkgconfig', type='build') # Required dependencies depends_on('libtiff@3.6.0:') # 3.9.0+ needed to pass testsuite diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index a06e5e3458..5ff3aabc77 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -134,7 +134,7 @@ class Graphviz(AutotoolsPackage): depends_on('gtkplus', when='+gtkplus') # Build dependencies - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') # The following are needed when building from git depends_on('automake', type='build') depends_on('autoconf', type='build') diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index cc12027578..44757b9e29 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -36,11 +36,11 @@ class I3(AutotoolsPackage): version('4.14.1', 'bdbb6d7bb5a647c8b7b53ed10de84cc5') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') - depends_on('m4', type='build') - depends_on('pkg-config', 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('libev') depends_on('startup-notification') diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index 4b4519b953..f5cc3249ff 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -34,7 +34,7 @@ class Mc(AutotoolsPackage): version('4.8.20', 'dcfc7aa613c62291a0f71f6b698d8267') depends_on('ncurses') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('glib@2.14:') depends_on('libssh2@1.2.5:') diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index cec0f027d7..faae212806 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -59,7 +59,7 @@ class Neuron(Package): depends_on('automake', type='build') depends_on('autoconf', type='build') depends_on('libtool', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('mpi', when='+mpi') depends_on('python@2.6:', when='+python') @@ -87,7 +87,7 @@ class Neuron(Package): def patch(self): # aclocal need complete include path (especially on os x) - pkgconf_inc = '-I %s/share/aclocal/' % (self.spec['pkg-config'].prefix) + pkgconf_inc = '-I %s/share/aclocal/' % (self.spec['pkgconfig'].prefix) libtool_inc = '-I %s/share/aclocal/' % (self.spec['libtool'].prefix) newpath = 'aclocal -I m4 %s %s' % (pkgconf_inc, libtool_inc) filter_file(r'aclocal -I m4', r'%s' % newpath, "build.sh") diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 686fa698db..2d269293c2 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -41,7 +41,7 @@ class Pandaseq(AutotoolsPackage): depends_on('libtool', type=('build', 'link')) depends_on('m4', type='build') depends_on('zlib', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('bzip2', type='link') def autoreconf(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index 50cbd959e1..a1496dbd0b 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -33,4 +33,4 @@ class PerlExtutilsPkgconfig(PerlPackage): version('1.16', 'b86318f2b6ac6af3ee985299e1e38fe5') - depends_on('pkg-config', type=('build', 'run')) + depends_on('pkgconfig', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 939a632043..27b049a31f 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -55,7 +55,7 @@ class Wireshark(CMakePackage): depends_on('libpcap') depends_on('lua@5.0.0:5.2.99') depends_on('krb5') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('libsmi', when='+smi') depends_on('libssh', when='+libssh') depends_on('nghttp2', when='+nghttp2') -- cgit v1.2.3-70-g09d2