From ab9dd114f2ba0bfbc514be1ecbed62dce879be73 Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Sun, 13 Jan 2019 12:20:16 -0500 Subject: [PATCH 1/4] Add tbb feature support to rocksdb to enable CLOCK algorithm --- ports/rocksdb/CONTROL | 4 ++++ ports/rocksdb/Findtbb.cmake | 13 +++++++++++++ ports/rocksdb/portfile.cmake | 12 +++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 ports/rocksdb/Findtbb.cmake diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 94bcc35fd0585e..8ec367068cfc51 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -14,3 +14,7 @@ Description: snappy support in rocksdb Feature: zlib Build-Depends: zlib Description: zlib support in rocksdb + +Feature: tbb +Build-Depends: tbb +Description: tbb support in rocksdb diff --git a/ports/rocksdb/Findtbb.cmake b/ports/rocksdb/Findtbb.cmake new file mode 100644 index 00000000000000..c60f824e807f49 --- /dev/null +++ b/ports/rocksdb/Findtbb.cmake @@ -0,0 +1,13 @@ +find_path(TBB_INCLUDE_DIR tbb.h) + +find_library(TBB_LIBRARY_DEBUG NAMES tbbd) +find_library(TBB_LIBRARY_RELEASE NAMES tbb) + +include(SelectLibraryConfigurations) +select_library_configurations(TBB) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + TBB DEFAULT_MSG + TBB_LIBRARY TBB_INCLUDE_DIR +) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 2b20131907f42e..202ef61a850642 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -39,6 +39,14 @@ if("zlib" IN_LIST FEATURES) set(WITH_ZLIB ON) endif() +set(WITH_TBB OFF) +set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) + set(ROCKSDB_IGNORE_PACKAGE_TBB FALSE) +endif() + + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -47,7 +55,9 @@ vcpkg_configure_cmake( -DWITH_SNAPPY=${WITH_SNAPPY} -DWITH_LZ4=${WITH_LZ4} -DWITH_ZLIB=${WITH_ZLIB} + -DWITH_TBB=${WITH_TBB} -DWITH_TESTS=OFF + -DUSE_RTTI=1 -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} @@ -55,7 +65,7 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB} -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB} - -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_TBB=${ROCKSDB_IGNORE_PACKAGE_TBB} -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE From 30632cdfa5cfecea52b7250fd0a7c7ec09b17814 Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Tue, 22 Jan 2019 16:24:37 -0500 Subject: [PATCH 2/4] Use RocksDB master branch. --- ports/rocksdb/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 202ef61a850642..f42ac285901ca8 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,6 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v5.17.2 - SHA512 c9f9bff747d0d2c97f8adb71d6a3bd5dc206c2fc567a47d0400abac61fec7f2a386d16cda5447bcf592cca006fd6d4c5ae1a68d122e2e2a03d3ebcc002dae147 HEAD_REF master PATCHES 0001-disable-gtest.patch From 27295d85621f87b3e1778b18c0e961dc192b90cd Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Mon, 4 Feb 2019 12:38:04 -0800 Subject: [PATCH 3/4] Undid RocksDB head requirement. --- ports/rocksdb/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index f42ac285901ca8..202ef61a850642 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,6 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb + REF v5.17.2 + SHA512 c9f9bff747d0d2c97f8adb71d6a3bd5dc206c2fc567a47d0400abac61fec7f2a386d16cda5447bcf592cca006fd6d4c5ae1a68d122e2e2a03d3ebcc002dae147 HEAD_REF master PATCHES 0001-disable-gtest.patch From 3195683d97d03bf6ccf3d395e515e393fc735d4f Mon Sep 17 00:00:00 2001 From: Cody Miller Date: Fri, 8 Feb 2019 10:23:40 -0800 Subject: [PATCH 4/4] fix: remove unnecessary FindTbb.cmake --- ports/rocksdb/Findtbb.cmake | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 ports/rocksdb/Findtbb.cmake diff --git a/ports/rocksdb/Findtbb.cmake b/ports/rocksdb/Findtbb.cmake deleted file mode 100644 index c60f824e807f49..00000000000000 --- a/ports/rocksdb/Findtbb.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(TBB_INCLUDE_DIR tbb.h) - -find_library(TBB_LIBRARY_DEBUG NAMES tbbd) -find_library(TBB_LIBRARY_RELEASE NAMES tbb) - -include(SelectLibraryConfigurations) -select_library_configurations(TBB) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - TBB DEFAULT_MSG - TBB_LIBRARY TBB_INCLUDE_DIR -)