diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/rocksdb/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rocksdb/pkg-config-6.28.patch | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py index 74d3633d41..419a3f8263 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('7.2.2', sha256='c4ea6bd2e3ffe3f0f8921c699234d59108c9122d61b0ba2aa78358642a7b614e') version('6.20.3', sha256='c6502c7aae641b7e20fafa6c2b92273d935d2b7b2707135ebd9a67b092169dca') version('6.19.3', sha256='5c19ffefea2bbe4c275d0c60194220865f508f371c64f42e802b4a85f065af5b') version('6.11.4', sha256='6793ef000a933af4a834b59b0cd45d3a03a3aac452a68ae669fb916ddd270532') @@ -42,7 +43,8 @@ class Rocksdb(MakefilePackage): depends_on('tbb', when='+tbb') # https://github.com/facebook/rocksdb/issues/8286 - patch('pkg-config.patch', when='@6.13.2:') + patch('pkg-config.patch', when='@6.13.2:6.27.3') + patch('pkg-config-6.28.patch', when='@6.28.2:') conflicts('~shared~static', msg='have to build one type of library') diff --git a/var/spack/repos/builtin/packages/rocksdb/pkg-config-6.28.patch b/var/spack/repos/builtin/packages/rocksdb/pkg-config-6.28.patch new file mode 100644 index 0000000000..d9d8babc17 --- /dev/null +++ b/var/spack/repos/builtin/packages/rocksdb/pkg-config-6.28.patch @@ -0,0 +1,14 @@ +--- a/Makefile ++++ b/Makefile +@@ -2007,9 +2007,9 @@ gen-pc: + -echo 'Name: rocksdb' >> rocksdb.pc + -echo 'Description: An embeddable persistent key-value store for fast storage' >> rocksdb.pc + -echo Version: $(shell ./build_tools/version.sh full) >> rocksdb.pc +- -echo 'Libs: -L$${libdir} $(EXEC_LDFLAGS) -lrocksdb' >> rocksdb.pc ++ -echo 'Libs: -L$${libdir} $(subst ','\'',$(EXEC_LDFLAGS)) -lrocksdb' >> rocksdb.pc + -echo 'Libs.private: $(PLATFORM_LDFLAGS)' >> rocksdb.pc +- -echo 'Cflags: -I$${includedir} $(PLATFORM_CXXFLAGS)' >> rocksdb.pc ++ -echo 'Cflags: -I$${includedir}' >> rocksdb.pc + -echo 'Requires: $(subst ",,$(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES))' >> rocksdb.pc + + #------------------------------------------------- |