Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rocksdb: Add version 6.0.2 #5900

Closed
wants to merge 4 commits into from
Closed

rocksdb: Add version 6.0.2 #5900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f969ca
rocksdb: Add version 6.0.2
fennibay Jun 15, 2021
2ac901a
fix: adapt patch file to 6.0.2
fennibay Jun 15, 2021
ff45efe
Merge branch 'conan-io:master' into rocksdb/add_v6.0.2
fennibay Jun 21, 2021
dfd9814
Do not compile RocksDB 6.0.2 with VS > 15
fennibay Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions recipes/rocksdb/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
sources:
"6.0.2":
url: https://github.com/facebook/rocksdb/archive/v6.0.2.tar.gz
sha256: 89e0832f1fb00ac240a9438d4bbdae37dd3e52f7c15c3f646dc26887da16f342
"6.8.1":
url: https://github.com/facebook/rocksdb/archive/v6.8.1.tar.gz
sha256: ca192a06ed3bcb9f09060add7e9d0daee1ae7a8705a3d5ecbe41867c5e2796a2
"6.10.2":
url: https://github.com/facebook/rocksdb/archive/v6.10.2.tar.gz
sha256: 514b315c64159dd767bbbf6430d33313903c0c9240d4249bddead5c4297d128f
patches:
"6.0.2":
- patch_file: "patches/6.0.2/0001-Rename-jemalloc-according-to-conan-packages.patch"
base_path: "source_subfolder"
"6.8.1":
- patch_file: "patches/6.8.1/0001-Rename-jemalloc-according-to-conan-packages.patch"
base_path: "source_subfolder"
Expand Down
6 changes: 6 additions & 0 deletions recipes/rocksdb/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ def configure(self):
self.settings.compiler == "Visual Studio" and \
tools.Version(self.settings.compiler.version) < "15":
raise ConanInvalidConfiguration("Rocksdb requires Visual Studio 15 or later.")

if self.version == "6.0.2" and \
self.settings.os == "Windows" and \
self.settings.compiler == "Visual Studio" and \
tools.Version(self.settings.compiler.version) > "15":
raise ConanInvalidConfiguration("Rocksdb 6.0.2 is not compilable with Visual Studio >15.") # See https://github.com/facebook/rocksdb/issues/6048

if self.settings.build_type == "Debug":
self.options.use_rtti = True # Rtti are used in asserts for debug mode...
Expand Down
9 changes: 9 additions & 0 deletions recipes/rocksdb/all/patches/6.0.2/0001-Rename-jemalloc-according-to-conan-packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -66,5 +66,5 @@ else()
set(WITH_JEMALLOC ON)
else()
if(WITH_JEMALLOC)
- find_package(JeMalloc REQUIRED)
+ find_package(jemalloc REQUIRED)
add_definitions(-DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE)
2 changes: 2 additions & 0 deletions recipes/rocksdb/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
versions:
"6.0.2":
folder: all
"6.8.1":
folder: all
"6.10.2":
Expand Down