diff options
| author | Dan Lipsa <dan.lipsa@kitware.com> | 2020-03-20 15:26:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 15:26:41 -0400 |
| commit | 9c45c44738049e062916f9df38eb41ff9c1594e3 (patch) | |
| tree | e31039353bfe131b6919a9ec7e0c0246fc0e9126 | |
| parent | 75fafcece9b179f1261bb007deac31bd179e020b (diff) | |
| download | spack-9c45c44738049e062916f9df38eb41ff9c1594e3.tar.gz spack-9c45c44738049e062916f9df38eb41ff9c1594e3.tar.bz2 spack-9c45c44738049e062916f9df38eb41ff9c1594e3.tar.xz spack-9c45c44738049e062916f9df38eb41ff9c1594e3.zip | |
Add version 5.8 and fix sqlite+column_metadata mismatch. (#15450)
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sqlite/package.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 111c8df7a4..48dff877e0 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -20,6 +20,7 @@ class Paraview(CMakePackage, CudaPackage): maintainers = ['chuckatkins', 'danlipsa'] version('develop', branch='master', submodules=True) + version('5.8.0', sha256='219e4107abf40317ce054408e9c3b22fb935d464238c1c00c0161f1c8697a3f9') version('5.7.0', sha256='e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874') version('5.6.2', sha256='1f3710b77c58a46891808dbe23dc59a1259d9c6b7bb123aaaeaa6ddf2be882ea') version('5.6.0', sha256='cb8c4d752ad9805c74b4a08f8ae6e83402c3f11e38b274dba171b99bb6ac2460') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 1ffb17ceb4..3f4c767a69 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -128,8 +128,7 @@ class Qt(Package): depends_on("gperf", when='+webkit') depends_on("gtkplus", when='+gtk') depends_on("openssl", when='+ssl') - depends_on("sqlite", when='+sql', type=('build', 'run')) - depends_on("sqlite+column_metadata", when='+sql%intel', type=('build', 'run')) + depends_on("sqlite+column_metadata", when='+sql', type=('build', 'run')) depends_on("libpng@1.2.57", when='@3') depends_on("libsm", when='@3') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index f8dd0e4948..4e79463f36 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -38,7 +38,7 @@ class Sqlite(AutotoolsPackage): '(unsafe for <3.26.0.0 due to Magellan).') variant('rtree', default=False, description='Build with Rtree module') - variant('column_metadata', default=False, description="Build with COLUMN_METADATA") + variant('column_metadata', default=True, description="Build with COLUMN_METADATA") # See https://blade.tencent.com/magellan/index_en.html conflicts('+fts', when='@:3.25.99.99') |