zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace pkg-config dependencies with virtual (#8783)

Browse Source 
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.
This commit is contained in:
Michael Kuhn
2018-08-02 19:29:05 +02:00
committed by scheibelp
parent b1c35e1e13
commit 12fb1cdbe5
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/neuron/package.py
View File

@@ -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 @@ def get_neuron_archdir(self):
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")