diff options
| author | Andrew Gaspar <andrew.gaspar@outlook.com> | 2020-10-01 14:09:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 16:09:24 -0400 |
| commit | 6aa9866b79a86576b77fe10a236eff15f53cae6e (patch) | |
| tree | c30e9febf3068243a4aefd8b9fe92a3fb4978a32 | |
| parent | 252031a9f8e1f015aa2a17563672d07974472d4f (diff) | |
| download | spack-6aa9866b79a86576b77fe10a236eff15f53cae6e.tar.gz spack-6aa9866b79a86576b77fe10a236eff15f53cae6e.tar.bz2 spack-6aa9866b79a86576b77fe10a236eff15f53cae6e.tar.xz spack-6aa9866b79a86576b77fe10a236eff15f53cae6e.zip | |
Add yacc provider and add dependency to swig (#19087)
* Add byacc dependency to swig when building an autoconf version
* Add yacc provider
Removed extra sycl provider default
| -rw-r--r-- | etc/spack/defaults/packages.yaml | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/bison/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/byacc/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/swig/package.py | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index ce1ee9c6b3..687f05a581 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -46,7 +46,7 @@ packages: szip: [libszip, libaec] tbb: [intel-tbb] unwind: [libunwind] - sycl: [hipsycl] + yacc: [bison, byacc] permissions: read: world write: user diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 003aff1290..7164b33870 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -38,6 +38,8 @@ class Bison(AutotoolsPackage, GNUMirrorPackage): # https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00008.html patch('parallel.patch', when='@3.4.2') + provides('yacc') + depends_on('diffutils', type='build') depends_on('m4', type=('build', 'run')) depends_on('perl', type='build') diff --git a/var/spack/repos/builtin/packages/byacc/package.py b/var/spack/repos/builtin/packages/byacc/package.py index b555910c42..e262ab0420 100644 --- a/var/spack/repos/builtin/packages/byacc/package.py +++ b/var/spack/repos/builtin/packages/byacc/package.py @@ -18,6 +18,8 @@ class Byacc(AutotoolsPackage): version('master', branch='master') + provides('yacc') + depends_on('m4', type='build') depends_on('autoconf', type='build') depends_on('automake', type='build') diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index 4196e35df8..87c92f483f 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -49,6 +49,7 @@ class Swig(AutotoolsPackage, SourceforgePackage): depends_on('autoconf', type='build', when=_version) depends_on('automake', type='build', when=_version) depends_on('libtool', type='build', when=_version) + depends_on('yacc', type='build', when=_version) # Need newer 'automake' to support newer platforms for _target in ['ppc64le', 'aarch64']: depends_on('automake@1.15:', type='build', when='target={0}:'.format(_target)) |