From 405303638819fbc8a16714a91ed36e344131dee0 Mon Sep 17 00:00:00 2001 From: darmac Date: Sat, 13 Jun 2020 09:18:38 +0800 Subject: fix depends issue and support for aarch64 (#17045) --- var/spack/repos/builtin/packages/mysql/package.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py index 7501d57cbd..80b49865b6 100644 --- a/var/spack/repos/builtin/packages/mysql/package.py +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -22,6 +22,7 @@ class Mysql(CMakePackage): version('8.0.13', sha256='d85eb7f98b6aa3e2c6fe38263bf40b22acb444a4ce1f4668473e9e59fb98d62e') version('8.0.12', sha256='69f16e20834dbc60cb28d6df7351deda323330b9de685d22415f135bcedd1b20') version('8.0.11', sha256='3bde3e30d5d4afcedfc6db9eed5c984237ac7db9480a9cc3bddc026d50700bf9') + version('5.7.27', sha256='f8b65872a358d6f5957de86715c0a3ef733b60451dad8d64a8fd1a92bf091bba') version('5.7.26', sha256='5f01d579a20199e06fcbc28f0801c3cb545a54a2863ed8634f17fe526480b9f1') version('5.7.25', sha256='53751c6243806103114567c1a8b6a3ec27f23c0e132f377a13ce1eb56c63723f') version('5.7.24', sha256='05bf0c92c6a97cf85b67fff1ac83ca7b3467aea2bf306374d727fa4f18431f87') @@ -77,11 +78,16 @@ class Mysql(CMakePackage): # Each version of MySQL requires a specific version of boost # See BOOST_PACKAGE_NAME in cmake/boost.cmake - # 8.0.16+ - depends_on('boost@1.69.0 cxxstd=98', type='build', when='@8.0.16: cxxstd=98') - depends_on('boost@1.69.0 cxxstd=11', type='build', when='@8.0.16: cxxstd=11') - depends_on('boost@1.69.0 cxxstd=14', type='build', when='@8.0.16: cxxstd=14') - depends_on('boost@1.69.0 cxxstd=17', type='build', when='@8.0.16: cxxstd=17') + # 8.0.19+ + depends_on('boost@1.70.0 cxxstd=98', type='build', when='@8.0.19: cxxstd=98') + depends_on('boost@1.70.0 cxxstd=11', type='build', when='@8.0.19: cxxstd=11') + depends_on('boost@1.70.0 cxxstd=11', type='build', when='@8.0.19: cxxstd=14') + depends_on('boost@1.70.0 cxxstd=17', type='build', when='@8.0.19: cxxstd=17') + # 8.0.16--8.0.18 + depends_on('boost@1.69.0 cxxstd=98', type='build', when='@8.0.16:8.0.18 cxxstd=98') + depends_on('boost@1.69.0 cxxstd=11', type='build', when='@8.0.16:8.0.18 cxxstd=11') + depends_on('boost@1.69.0 cxxstd=14', type='build', when='@8.0.16:8.0.18 cxxstd=14') + depends_on('boost@1.69.0 cxxstd=17', type='build', when='@8.0.16:8.0.18 cxxstd=17') # 8.0.14--8.0.15 depends_on('boost@1.68.0 cxxstd=98', type='build', when='@8.0.14:8.0.15 cxxstd=98') depends_on('boost@1.68.0 cxxstd=11', type='build', when='@8.0.14:8.0.15 cxxstd=11') @@ -103,6 +109,7 @@ class Mysql(CMakePackage): depends_on('boost@1.59.0 cxxstd=14', when='@5.7.0:5.7.999 cxxstd=14') depends_on('boost@1.59.0 cxxstd=17', when='@5.7.0:5.7.999 cxxstd=17') + depends_on('rpcsvc-proto') depends_on('ncurses') depends_on('openssl') depends_on('libtirpc', when='@5.7.0:') -- cgit v1.2.3-60-g2f50