diff --git a/recipes/rocksdb/all/conandata.yml b/recipes/rocksdb/all/conandata.yml index 83f04467584fa..c5b9e1f8e6324 100644 --- a/recipes/rocksdb/all/conandata.yml +++ b/recipes/rocksdb/all/conandata.yml @@ -1,4 +1,7 @@ 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,6 +9,9 @@ sources: 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" diff --git a/recipes/rocksdb/all/conanfile.py b/recipes/rocksdb/all/conanfile.py index d312127b85dba..271aa933461af 100644 --- a/recipes/rocksdb/all/conanfile.py +++ b/recipes/rocksdb/all/conanfile.py @@ -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... diff --git a/recipes/rocksdb/all/patches/6.0.2/0001-Rename-jemalloc-according-to-conan-packages.patch b/recipes/rocksdb/all/patches/6.0.2/0001-Rename-jemalloc-according-to-conan-packages.patch new file mode 100644 index 0000000000000..fa3904b84954a --- /dev/null +++ b/recipes/rocksdb/all/patches/6.0.2/0001-Rename-jemalloc-according-to-conan-packages.patch @@ -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) diff --git a/recipes/rocksdb/config.yml b/recipes/rocksdb/config.yml index a799555579754..ccc2790b7992e 100644 --- a/recipes/rocksdb/config.yml +++ b/recipes/rocksdb/config.yml @@ -1,5 +1,7 @@ --- versions: + "6.0.2": + folder: all "6.8.1": folder: all "6.10.2":