rocksdb: Stop publishing revisions for old versions and recipe cleanup (#28425)

* Stop maintaining old versions

Signed-off-by: Uilian Ries <[email protected]>

* Always has folly as option

Signed-off-by: Uilian Ries <[email protected]>

* Move replacement to a separate patch file

Signed-off-by: Uilian Ries <[email protected]>

* Apply patches in source step

Signed-off-by: Uilian Ries <[email protected]>

* Remove has lite

Signed-off-by: Uilian Ries <[email protected]>

* with_folly always present

Signed-off-by: Uilian Ries <[email protected]>

* Remove virtual component

Signed-off-by: Uilian Ries <[email protected]>

* Avoid collect_libs

Signed-off-by: Uilian Ries <[email protected]>

* Simplify test package

Signed-off-by: Uilian Ries <[email protected]>

* Remove 6.29.5 from config.yml

Signed-off-by: Uilian Ries <[email protected]>

* Unused

Signed-off-by: Uilian Ries <[email protected]>

* Keep all headers

Signed-off-by: Uilian Ries <[email protected]>

* Simplify test package to be compatible

Signed-off-by: Uilian Ries <[email protected]>

* Revert CMakeLists

Signed-off-by: Uilian Ries <[email protected]>

* Restore back legacy librocksdb component to avoid breaking users

Signed-off-by: Uilian Ries <[email protected]>

* Replace patch by replace_in_file for linker flag

Signed-off-by: Uilian Ries <[email protected]>

---------

Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>

Author: uilianries

recipes/rocksdb/all/conandata.yml

@@ -2,61 +2,7 @@ sources:
   "10.5.1":
     url: "https://github.com/facebook/rocksdb/archive/refs/tags/v10.5.1.tar.gz"
     sha256: "7EC942BAAB802B2845188D02BC5D4E42C29236E61BCBC08F5B3A6BDD92290C22"
-  "10.0.1":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v10.0.1.tar.gz"
-    sha256: "3fdc9ca996971c4c039959866382c4a3a6c8ade4abf888f3b2ff77153e07bf28"
-  "9.10.0":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v9.10.0.tar.gz"
-    sha256: "FDCCAB16133C9D927A183C2648BCEA8D956FB41EB1DF2AACAA73EB0B95E43724"
-  "9.7.4":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v9.7.4.tar.gz"
-    sha256: "9b810c81731835fda0d4bbdb51d3199d901fa4395733ab63752d297da84c5a47"
-  "9.5.2":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v9.5.2.tar.gz"
-    sha256: "B20780586D3DF4A3C5BCBDE341A2C1946B03D18237960BDA5BC5E9538F42AF40"
-  "9.4.0":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v9.4.0.tar.gz"
-    sha256: "1f829976aa24b8ba432e156f52c9e0f0bd89c46dc0cc5a9a628ea70571c1551c"
-  "8.8.1":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v8.8.1.tar.gz"
-    sha256: "056c7e21ad8ae36b026ac3b94b9d6e0fcc60e1d937fc80330921e4181be5c36e"
-  "6.29.5":
-    url: "https://github.com/facebook/rocksdb/archive/refs/tags/v6.29.5.tar.gz"
-    sha256: "ddbf84791f0980c0bbce3902feb93a2c7006f6f53bfd798926143e31d4d756f0"
 patches:
   "10.5.1":
     - patch_file: "patches/9.x.x-0001-exclude-thirdparty.patch"
       patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "10.0.1":
-    - patch_file: "patches/9.x.x-0001-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "9.10.0":
-    - patch_file: "patches/9.x.x-0001-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "9.7.4":
-    - patch_file: "patches/9.x.x-0001-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "9.5.2":
-    - patch_file: "patches/9.x.x-0001-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "9.4.0":
-    - patch_file: "patches/9.x.x-0001-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "8.8.1":
-    - patch_file: "patches/8.8.1-0001-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"
-  "6.29.5":
-    - patch_file: "patches/6.29.5-0001-add-include-cstdint-for-gcc-13.patch"
-      patch_description: "Fix build with gcc 13 by including cstdint"
-      patch_type: "portability"
-      patch_source: "https://github.com/facebook/rocksdb/pull/11118"
-    - patch_file: "patches/6.29.5-0002-exclude-thirdparty.patch"
-      patch_description: "Do not include thirdparty.inc"
-      patch_type: "portability"

recipes/rocksdb/all/conanfile.py

@@ -1,12 +1,11 @@
 import glob
 import os
-import shutil
 
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import apply_conandata_patches, collect_libs, copy, export_conandata_patches, get, rm, rmdir, replace_in_file
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rm, rmdir, replace_in_file
 from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
 from conan.tools.scm import Version
 
@@ -25,7 +24,6 @@ class RocksDBConan(ConanFile):
     options = {
         "shared": [True, False],
         "fPIC": [True, False],
-        "lite": [True, False],
         "with_gflags": [True, False],
         "with_snappy": [True, False],
         "with_lz4": [True, False],
@@ -40,7 +38,6 @@ class RocksDBConan(ConanFile):
     default_options = {
         "shared": False,
         "fPIC": True,
-        "lite": False,
         "with_snappy": False,
         "with_lz4": False,
         "with_zlib": False,
@@ -52,22 +49,7 @@ class RocksDBConan(ConanFile):
         "enable_sse": False,
         "use_rtti": False,
     }
-
-    @property
-    def _min_cppstd(self):
-        return "11" if Version(self.version) < "8.8.1" else "17"
-
-    @property
-    def _has_folly(self):
-        # Folly became unvendored in 7.7.2
-        # https://github.com/facebook/rocksdb/commit/be09943fb58a2dd3f70e6e30781ebfa3fcbcb8fa
-        return Version(self.version) >= "7.7.2"
-
-    @property
-    def _has_lite(self):
-        # https://github.com/facebook/rocksdb/commit/4720ba4391eb016b05a30d09a8275624c3a4a87e
-        return Version(self.version) < "8.0.0"
-
+    
     def export_sources(self):
         export_conandata_patches(self)
 
@@ -78,10 +60,6 @@ def config_options(self):
             del self.options.with_tbb
         if self.settings.build_type == "Debug":
             self.options.use_rtti = True  # Rtti are used in asserts for debug mode...
-        if not self._has_folly:
-            del self.options.with_folly
-        if not self._has_lite:
-            del self.options.lite
 
     def configure(self):
         if self.options.shared:
@@ -105,24 +83,32 @@ def requirements(self):
             self.requires("onetbb/2021.10.0")
         if self.options.with_jemalloc:
             self.requires("jemalloc/5.3.0")
-        if self.options.get_safe("with_folly"):
+        if self.options.with_folly:
             self.requires("folly/2024.08.12.00")
 
     def validate(self):
-        check_min_cppstd(self, self._min_cppstd)
+        check_min_cppstd(self, 17)
 
         if self.settings.arch not in ["x86_64", "ppc64le", "ppc64", "mips64", "armv8"]:
             raise ConanInvalidConfiguration("Rocksdb requires 64 bits")
 
         if is_msvc(self) and Version(self.settings.compiler.version) < "191":
             raise ConanInvalidConfiguration("Rocksdb requires MSVC version >= 191")
 
-        if self.options.shared and self.options.get_safe("with_folly"):
+        if self.options.shared and self.options.with_folly:
             # https://github.com/facebook/rocksdb/blob/v10.5.1/CMakeLists.txt#L603
             raise ConanInvalidConfiguration(f"{self.ref} does not support a shared build with folly")
 
+    def _patch_sources(self):
+        # INFO: Avoid enforcing all linkers to use copy-dt-needed-entries
+        # https://github.com/facebook/rocksdb/issues/13895
+        replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
+                         'set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")', "")
+
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
+        apply_conandata_patches(self)
+        self._patch_sources()
 
     def generate(self):
         tc = CMakeToolchain(self)
@@ -131,16 +117,10 @@ def generate(self):
         tc.variables["WITH_TOOLS"] = False
         tc.variables["WITH_CORE_TOOLS"] = False
         tc.variables["WITH_BENCHMARK_TOOLS"] = False
-        if Version(self.version) < "7.2.0":
-            # https://github.com/facebook/rocksdb/commit/efd035164b443e0ae552a82ad8b47a8048e652ca
-            tc.variables["WITH_FOLLY_DISTRIBUTED_MUTEX"] = False
-        if self._has_folly:
-            tc.variables["USE_FOLLY"] = self.options.with_folly
+        tc.variables["USE_FOLLY"] = self.options.with_folly
         if is_msvc(self):
             tc.variables["WITH_MD_LIBRARY"] = not is_msvc_static_runtime(self)
         tc.variables["ROCKSDB_INSTALL_ON_WINDOWS"] = self.settings.os == "Windows"
-        if self._has_lite:
-            tc.variables["ROCKSDB_LITE"] = self.options.lite
         tc.variables["WITH_GFLAGS"] = self.options.with_gflags
         tc.variables["WITH_SNAPPY"] = self.options.with_snappy
         tc.variables["WITH_LZ4"] = self.options.with_lz4
@@ -172,20 +152,11 @@ def generate(self):
             deps.set_property("jemalloc", "cmake_target_name", "JeMalloc::JeMalloc")
         if self.options.with_zstd:
             deps.set_property("zstd", "cmake_target_name", "zstd::zstd")
-        if self.options.get_safe("with_folly"):
+        if self.options.with_folly:
             deps.set_property("folly", "cmake_additional_variables_prefixes", ["FOLLY",])
         deps.generate()
 
-    def _patch_sources(self):
-        # INFO: --copy-dt-needed-entries is only needed for ld.bfd and breaks other linkers like ld.gold and lld
-        # https://github.com/facebook/rocksdb/issues/13895
-        if self._has_folly:
-            replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
-                         'set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")', "")
-
     def build(self):
-        apply_conandata_patches(self)
-        self._patch_sources()
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
@@ -196,41 +167,29 @@ def _remove_static_libraries(self):
             if not lib.endswith(".dll.a"):
                 os.remove(lib)
 
-    def _remove_cpp_headers(self):
-        for path in glob.glob(os.path.join(self.package_folder, "include", "rocksdb", "*")):
-            if path != os.path.join(self.package_folder, "include", "rocksdb", "c.h"):
-                if os.path.isfile(path):
-                    os.remove(path)
-                else:
-                    shutil.rmtree(path)
-
     def package(self):
         copy(self, "COPYING", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         copy(self, "LICENSE*", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         cmake = CMake(self)
         cmake.install()
         if self.options.shared:
             self._remove_static_libraries()
-            self._remove_cpp_headers() # Force stable ABI for shared libraries
         rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
         rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 
     def package_info(self):
         cmake_target = "rocksdb-shared" if self.options.shared else "rocksdb"
         self.cpp_info.set_property("cmake_file_name", "RocksDB")
         self.cpp_info.set_property("cmake_target_name", f"RocksDB::{cmake_target}")
-        # TODO: back to global scope in conan v2 once cmake_find_package* generators removed
-        self.cpp_info.components["librocksdb"].libs = collect_libs(self)
+        # INFO: Component librocksdb is legacy due cmake_find_package but may break a few users in case removed
+        lib_suffix = "-shared" if is_msvc(self) and self.options.shared else ""
+        self.cpp_info.components["librocksdb"].libs = [f"rocksdb{lib_suffix}"]
         if self.settings.os == "Windows":
             self.cpp_info.components["librocksdb"].system_libs = ["shlwapi", "rpcrt4"]
             if self.options.shared:
                 self.cpp_info.components["librocksdb"].defines = ["ROCKSDB_DLL"]
         elif self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.components["librocksdb"].system_libs = ["pthread", "m"]
-        if self.options.get_safe("lite"):
-            self.cpp_info.components["librocksdb"].defines.append("ROCKSDB_LITE")
-
-        self.cpp_info.components["librocksdb"].set_property("cmake_target_name", f"RocksDB::{cmake_target}")
         if self.options.with_gflags:
             self.cpp_info.components["librocksdb"].requires.append("gflags::gflags")
         if self.options.with_snappy:
@@ -245,5 +204,5 @@ def package_info(self):
             self.cpp_info.components["librocksdb"].requires.append("onetbb::onetbb")
         if self.options.with_jemalloc:
             self.cpp_info.components["librocksdb"].requires.append("jemalloc::jemalloc")
-        if self.options.get_safe("with_folly"):
-            self.cpp_info.components["librocksdb"].requires.append("folly::folly")
+        if self.options.with_folly:
+            self.cpp_info.components["librocksdb"].requires.append("folly::folly")

recipes/rocksdb/all/patches/6.29.5-0001-add-include-cstdint-for-gcc-13.patch

@@ -1,23 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(test_package LANGUAGES CXX)
 
-enable_testing()
-
 find_package(RocksDB REQUIRED CONFIG)
 
-add_executable(${PROJECT_NAME}_stable_abi test_package_stable_abi.cpp)
-add_test(NAME ${PROJECT_NAME}_stable_abi COMMAND ${PROJECT_NAME}_stable_abi)
-if(ROCKSDB_SHARED)
-    target_link_libraries(${PROJECT_NAME}_stable_abi PRIVATE RocksDB::rocksdb-shared)
-else()
-    target_link_libraries(${PROJECT_NAME}_stable_abi PRIVATE RocksDB::rocksdb)
-
-    add_executable(${PROJECT_NAME}_cpp test_package.cpp)
-    target_link_libraries(${PROJECT_NAME}_cpp PRIVATE RocksDB::rocksdb)
-    if(RocksDB_VERSION VERSION_LESS "8.8.1")
-        target_compile_features(${PROJECT_NAME}_cpp PRIVATE cxx_std_11)
-    else()
-        target_compile_features(${PROJECT_NAME}_cpp PRIVATE cxx_std_17)
-    endif()
-    add_test(NAME ${PROJECT_NAME}_cpp COMMAND ${PROJECT_NAME}_cpp)
-endif()
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE $<IF:$<TARGET_EXISTS:RocksDB::rocksdb-shared>,RocksDB::rocksdb-shared,RocksDB::rocksdb>)

recipes/rocksdb/all/patches/6.29.5-0002-exclude-thirdparty.patch

@@ -1,29 +1,25 @@
+import os
 from conan import ConanFile
 from conan.tools.build import can_run
-from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+from conan.tools.cmake import CMake, cmake_layout
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeDeps", "VirtualRunEnv"
-    test_type = "explicit"
+    generators = "CMakeDeps", "CMakeToolchain"
 
     def layout(self):
         cmake_layout(self)
 
     def requirements(self):
         self.requires(self.tested_reference_str)
-
-    def generate(self):
-        tc = CMakeToolchain(self)
-        tc.variables["ROCKSDB_SHARED"] = self.dependencies["rocksdb"].options.shared
-        tc.generate()
-
+    
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
         if can_run(self):
-            self.run(f"ctest --output-on-failure -C {self.settings.build_type}", env="conanrun")
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")