diff options
| author | Michael Kuhn <michael.kuhn@ovgu.de> | 2021-05-12 00:34:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 15:34:12 -0700 |
| commit | e763ac00fa3de4d0dac4eadb60478e31c8bf3a1f (patch) | |
| tree | 8646e6ed9b031435974a8f4ad2cfd709eb6d9456 | |
| parent | 4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a (diff) | |
| download | spack-e763ac00fa3de4d0dac4eadb60478e31c8bf3a1f.tar.gz spack-e763ac00fa3de4d0dac4eadb60478e31c8bf3a1f.tar.bz2 spack-e763ac00fa3de4d0dac4eadb60478e31c8bf3a1f.tar.xz spack-e763ac00fa3de4d0dac4eadb60478e31c8bf3a1f.zip | |
rocksdb: add 6.20.3 (#23571)
This also adds a patch to fix the pkg-config file when used with C compilers, Clang etc.
| -rw-r--r-- | var/spack/repos/builtin/packages/rocksdb/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rocksdb/pkg-config.patch | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py index def9b042f2..0a4c3a3879 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.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'] diff --git a/var/spack/repos/builtin/packages/rocksdb/pkg-config.patch b/var/spack/repos/builtin/packages/rocksdb/pkg-config.patch new file mode 100644 index 0000000000..284185c42a --- /dev/null +++ b/var/spack/repos/builtin/packages/rocksdb/pkg-config.patch @@ -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 + + #------------------------------------------------- + |