rocksdb: add 6.20.3 (#23571)
This also adds a patch to fix the pkg-config file when used with C compilers, Clang etc.
This commit is contained in:
parent
4a50e35262
commit
e763ac00fa
@ -14,6 +14,7 @@ class Rocksdb(MakefilePackage):
|
||||
git = 'https://github.com/facebook/rocksdb.git'
|
||||
|
||||
version('master', git=git, branch='master', submodules=True)
|
||||
version('6.20.3', sha256='c6502c7aae641b7e20fafa6c2b92273d935d2b7b2707135ebd9a67b092169dca')
|
||||
version('6.19.3', sha256='5c19ffefea2bbe4c275d0c60194220865f508f371c64f42e802b4a85f065af5b')
|
||||
version('6.11.4', sha256='6793ef000a933af4a834b59b0cd45d3a03a3aac452a68ae669fb916ddd270532')
|
||||
version('6.7.3', sha256='c4d1397b58e4801b5fd7c3dd9175e6ae84541119cbebb739fe17d998f1829e81')
|
||||
@ -40,6 +41,9 @@ class Rocksdb(MakefilePackage):
|
||||
depends_on('zstd', when='+zstd')
|
||||
depends_on('tbb', when='+tbb')
|
||||
|
||||
# https://github.com/facebook/rocksdb/issues/8286
|
||||
patch('pkg-config.patch', when='@6.13.2:')
|
||||
|
||||
conflicts('~shared~static', msg='have to build one type of library')
|
||||
|
||||
phases = ['install']
|
||||
|
11
var/spack/repos/builtin/packages/rocksdb/pkg-config.patch
Normal file
11
var/spack/repos/builtin/packages/rocksdb/pkg-config.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1919,7 +1919,7 @@ gen-pc:
|
||||
-echo Version: $(shell ./build_tools/version.sh full) >> rocksdb.pc
|
||||
-echo 'Libs: -L$${libdir} $(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
|
||||
|
||||
#-------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user