summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hows <howsdav@gmail.com>2019-03-13 12:57:29 +1100
committerAdam J. Stewart <ajstewart426@gmail.com>2019-03-12 20:57:29 -0500
commitc629a6f780fee0847aada78ff3254567912745b4 (patch)
tree9e4d2ba45bdbe94b36208fdba1e1434b4c4c279b
parent82e9c01b5cebbaee1cbdf47969e0067de44b371e (diff)
downloadspack-c629a6f780fee0847aada78ff3254567912745b4.tar.gz
spack-c629a6f780fee0847aada78ff3254567912745b4.tar.bz2
spack-c629a6f780fee0847aada78ff3254567912745b4.tar.xz
spack-c629a6f780fee0847aada78ff3254567912745b4.zip
Fix mysqldb1 (#9978)
* Update package.py * Add MYSQL Package file * Fixes for linter
-rw-r--r--var/spack/repos/builtin/packages/mysql/package.py16
-rw-r--r--var/spack/repos/builtin/packages/py-mysqldb1/package.py3
2 files changed, 17 insertions, 2 deletions
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')