From 469bef880a402ce8d7b4b3b804c18f32884c6fb4 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 9 Oct 2019 21:45:31 +0200 Subject: [PATCH] mysql: Add missing dependencies (#12717) This also changes the default for cxxstd from 98 to 14 because (at least) newer versions of mysql do not compile with 98 (tested with gcc@9). --- var/spack/repos/builtin/packages/mysql/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py index db1ab0ff3c..9c5656ad97 100644 --- a/var/spack/repos/builtin/packages/mysql/package.py +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -44,7 +44,7 @@ class Mysql(CMakePackage): variant('client_only', default=False, description='Build and install client only.') variant('cxxstd', - default='98', + default='14', values=('98', '11', '14', '17'), multi=False, description='Use the specified C++ standard when building.') @@ -69,6 +69,8 @@ class Mysql(CMakePackage): depends_on('cmake@2.8.12:', type='build', when='@8.0.0:') depends_on('gmake@3.75:', type='build') + depends_on('pkgconfig', type='build', when='@5.7.0:') + depends_on('doxygen', type='build', when='@8.0.0:') # Each version of MySQL requires a specific version of boost # See BOOST_PACKAGE_NAME in cmake/boost.cmake @@ -100,8 +102,9 @@ class Mysql(CMakePackage): depends_on('ncurses') depends_on('openssl') + depends_on('libtirpc', when='@5.7.0:') depends_on('perl', type=['build', 'test'], when='@:7.99.99') - depends_on('bison@2.1:', type='build', when='@develop') + depends_on('bison@2.1:', type='build') depends_on('m4', type='build', when='@develop platform=solaris') patch('fix-no-server-5.5.patch', level=1, when='@5.5.0:5.5.999')