From 6aa9866b79a86576b77fe10a236eff15f53cae6e Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Thu, 1 Oct 2020 14:09:24 -0600 Subject: [PATCH] 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 --- etc/spack/defaults/packages.yaml | 2 +- var/spack/repos/builtin/packages/bison/package.py | 2 ++ var/spack/repos/builtin/packages/byacc/package.py | 2 ++ var/spack/repos/builtin/packages/swig/package.py | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index ce1ee9c6b35..687f05a581b 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 003aff1290f..7164b338707 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 b555910c42f..e262ab0420c 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 4196e35df8c..87c92f483f7 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))