From c629a6f780fee0847aada78ff3254567912745b4 Mon Sep 17 00:00:00 2001 From: David Hows Date: Wed, 13 Mar 2019 12:57:29 +1100 Subject: Fix mysqldb1 (#9978) * Update package.py * Add MYSQL Package file * Fixes for linter --- var/spack/repos/builtin/packages/mysql/package.py | 16 ++++++++++++++++ var/spack/repos/builtin/packages/py-mysqldb1/package.py | 3 +-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/mysql/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py new file mode 100644 index 0000000000..16be4d7314 --- /dev/null +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack import * + + +class Mysql(CMakePackage): + homepage = "http://dev.mysql.com" + url = "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.11.tar.gz" + + version('8.0.11', '38d5a5c1a1eeed1129fec3a999aa5efd') + version('5.7.22', '269935a8b72dcba2c774d8d63a8bd1dd') + + depends_on('boost@1.66.0', when='@8.0.11') + depends_on('boost@1.59.0', when='@5.7.22') diff --git a/var/spack/repos/builtin/packages/py-mysqldb1/package.py b/var/spack/repos/builtin/packages/py-mysqldb1/package.py index 07be1f472f..79e195d8d4 100644 --- a/var/spack/repos/builtin/packages/py-mysqldb1/package.py +++ b/var/spack/repos/builtin/packages/py-mysqldb1/package.py @@ -14,6 +14,5 @@ class PyMysqldb1(PythonPackage): version('1.2.5', '332c8f4955b6bc0c79ea15170bf7321b', url="https://github.com/farcepest/MySQLdb1/archive/MySQLdb-1.2.5.tar.gz") - # FIXME: Missing dependency on mysql - + depends_on('mysql@:6') depends_on('py-setuptools', type='build') -- cgit v1.2.3-60-g2f50