diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-08-25 04:33:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 11:33:36 +0200 |
| commit | b305990ee837ed018e6bf2e5eedfb643f3adc5b8 (patch) | |
| tree | 4e1b7093d84a176fc1efe28e094b767609ddfb67 /var | |
| parent | 9b07669ab3c2d4939a88f82858ea0b95d857fb45 (diff) | |
| download | spack-b305990ee837ed018e6bf2e5eedfb643f3adc5b8.tar.gz spack-b305990ee837ed018e6bf2e5eedfb643f3adc5b8.tar.bz2 spack-b305990ee837ed018e6bf2e5eedfb643f3adc5b8.tar.xz spack-b305990ee837ed018e6bf2e5eedfb643f3adc5b8.zip | |
pkgconfig: add conflict for PGI (#18236)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/pkg-config/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pkgconf/package.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index d4def51e21..0863e920a6 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -25,6 +25,9 @@ class PkgConfig(AutotoolsPackage): # The following patch is needed for gcc-6.1 patch('g_date_strftime.patch', when='@:0.29.1') + # https://github.com/spack/spack/issues/3525 + conflicts('%pgi') + parallel = False executables = ['^pkg-config$'] diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index 2d3af9bdc5..e5aa5540e5 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -31,6 +31,9 @@ class Pkgconf(AutotoolsPackage): # TODO: Add a package for the kyua testing framework # depends_on('kyua', type='test') + # https://github.com/spack/spack/issues/3525 + conflicts('%pgi') + executables = ['^pkgconf$', '^pkg-config$'] @classmethod |