diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-04-05 15:28:05 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-04-05 22:02:37 -0700 |
| commit | 89201f4aecdfefb2cc456b4f71e9dcf63c1d93c9 (patch) | |
| tree | f88c643ac2f7c73996f06edb736ba06a93fdb4fb /ports/rocksdb | |
| parent | 2e354dd23357af7e0ec23798ee2448ee196a1eef (diff) | |
| download | vcpkg-89201f4aecdfefb2cc456b4f71e9dcf63c1d93c9.tar.gz vcpkg-89201f4aecdfefb2cc456b4f71e9dcf63c1d93c9.zip | |
[abseil][aws-sdk-cpp][azure-c-shared-utility][azure-iot-sdk-c][azure-uamqp-c][azure-umqtt-c][breakpad][exiv2][gdcm2][grpc][nuklear][rocksdb][rs-core-lib][thrift][zeromq] Upgrades
Diffstat (limited to 'ports/rocksdb')
| -rw-r--r-- | ports/rocksdb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/rocksdb/pass-major-version.patch | 20 | ||||
| -rw-r--r-- | ports/rocksdb/portfile.cmake | 10 |
3 files changed, 27 insertions, 5 deletions
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 6e3f6a4c5..852281924 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.11.3-3 +Version: 5.12.2 Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/pass-major-version.patch b/ports/rocksdb/pass-major-version.patch new file mode 100644 index 000000000..1cc3f2d13 --- /dev/null +++ b/ports/rocksdb/pass-major-version.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d6bfbf2..ea6a884 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,6 +132,7 @@ endif()
+
+ string(REGEX REPLACE "[^0-9a-f]+" "" GIT_SHA "${GIT_SHA}")
+
++if(NOT DEFINED ROCKSDB_VERSION OR NOT DEFINED ROCKSDB_VERSION_MAJOR)
+ set(SH_CMD "sh")
+ execute_process(COMMAND
+ ${SH_CMD} -c "build_tools/version.sh full"
+@@ -145,6 +146,7 @@ execute_process(COMMAND
+ OUTPUT_VARIABLE ROCKSDB_VERSION_MAJOR
+ )
+ string(STRIP "${ROCKSDB_VERSION_MAJOR}" ROCKSDB_VERSION_MAJOR)
++endif()
+
+ option(WITH_MD_LIBRARY "build with MD" ON)
+ if(WIN32 AND MSVC)
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 169573cf3..92ca0c2fa 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF rocksdb-5.11.3 - SHA512 a4c771e36056ee0da497202b25092d89799db43573a442568b4392b8478ac20320dabf4c904e93bd0641a32f249e9c8dcad0d67577acaee6902cd4d30f29ce57 + REF v5.12.2 + SHA512 53e81e87e84f0500cd09d754c39e86265a16a52d4b84f9044f8d9759c224881eb7ef4bf89f9b01fdff25f123ed4dfa7b5cb272d2311f27b322c15fe2e893bbe3 HEAD_REF master ) @@ -14,6 +14,7 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/0002-disable-gtest.patch" "${CMAKE_CURRENT_LIST_DIR}/0003-only-build-one-flavor.patch" "${CMAKE_CURRENT_LIST_DIR}/use-find-package.patch" + "${CMAKE_CURRENT_LIST_DIR}/pass-major-version.patch" ) file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake") @@ -48,7 +49,8 @@ if("zlib" IN_LIST FEATURES) endif() get_filename_component(ROCKSDB_VERSION "${SOURCE_PATH}" NAME) -string(REPLACE "rocksdb-rocksdb-" "" ROCKSDB_VERSION "${ROCKSDB_VERSION}") +string(REPLACE "rocksdb-" "" ROCKSDB_VERSION "${ROCKSDB_VERSION}") +string(REGEX REPLACE "^([0-9]+)." "\\1" ROCKSDB_MAJOR_VERSION "${ROCKSDB_VERSION}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -67,7 +69,7 @@ vcpkg_configure_cmake( -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB} -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB} -DROCKSDB_VERSION=${ROCKSDB_VERSION} - -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} + -DROCKSDB_VERSION_MAJOR=${ROCKSDB_MAJOR_VERSION} -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE |