summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/rocksdb/package.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py
index 574bff0dbe..def9b042f2 100644
--- a/var/spack/repos/builtin/packages/rocksdb/package.py
+++ b/var/spack/repos/builtin/packages/rocksdb/package.py
@@ -14,6 +14,7 @@ class Rocksdb(MakefilePackage):
git = 'https://github.com/facebook/rocksdb.git'
version('master', git=git, branch='master', submodules=True)
+ version('6.19.3', sha256='5c19ffefea2bbe4c275d0c60194220865f508f371c64f42e802b4a85f065af5b')
version('6.11.4', sha256='6793ef000a933af4a834b59b0cd45d3a03a3aac452a68ae669fb916ddd270532')
version('6.7.3', sha256='c4d1397b58e4801b5fd7c3dd9175e6ae84541119cbebb739fe17d998f1829e81')
version('6.5.3', sha256='6dc023a11d61d00c8391bd44f26ba7db06c44be228c10b552edc84e02d7fbde2')
@@ -88,16 +89,28 @@ class Rocksdb(MakefilePackage):
env['CFLAGS'] = ' '.join(cflags)
env['PLATFORM_FLAGS'] = ' '.join(ldflags)
- env['INSTALL_PATH'] = self.spec.prefix
+
+ if self.spec.satisfies('@6.13.2:'):
+ env['PREFIX'] = self.spec.prefix
+ else:
+ env['INSTALL_PATH'] = self.spec.prefix
if '+static' in spec:
make('install-static')
+ # We need to clean before building the shared library, otherwise
+ # we might end up with errors regarding missing -fPIC.
+ if '+static+shared' in spec:
+ make('clean')
+
if '+shared' in spec:
make('install-shared')
@run_after('install')
def install_pkgconfig(self):
+ if self.spec.satisfies('@6.13.2:'):
+ return
+
libdir = self.spec['rocksdb'].libs.directories[0]
pkg_path = join_path(libdir, 'pkgconfig')
mkdirp(pkg_path)