diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-03-12 15:03:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 15:03:50 -0700 |
| commit | 990a5d71bf5b472fd1ba8c6bbf1ab2e152ce6454 (patch) | |
| tree | bda01e069bbd377f6a1cf27a7ee858d74fe48a63 /ports/rocksdb | |
| parent | 2808536e57b3cb905268387bb752eb223a4fc7ef (diff) | |
| parent | 92eb878b3efdb780097178125066a6070869c954 (diff) | |
| download | vcpkg-990a5d71bf5b472fd1ba8c6bbf1ab2e152ce6454.tar.gz vcpkg-990a5d71bf5b472fd1ba8c6bbf1ab2e152ce6454.zip | |
Merge pull request #3013 from yurybura/master
[rocksdb] Fix build and use debug suffix 'd'
Diffstat (limited to 'ports/rocksdb')
| -rw-r--r-- | ports/rocksdb/0001-third-party.patch | 8 | ||||
| -rw-r--r-- | ports/rocksdb/CONTROL | 4 | ||||
| -rw-r--r-- | ports/rocksdb/portfile.cmake | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/ports/rocksdb/0001-third-party.patch b/ports/rocksdb/0001-third-party.patch index c28181623..0b0e3fa8c 100644 --- a/ports/rocksdb/0001-third-party.patch +++ b/ports/rocksdb/0001-third-party.patch @@ -21,8 +21,8 @@ index a364d1d..1d85d50 100644 -set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/bin/retail/amd64/gflags.lib) +set(GFLAGS_HOME ${CURRENT_INSTALLED_DIR}) +set(GFLAGS_INCLUDE ${GFLAGS_HOME}/include) -+find_library(GFLAGS_LIB_DEBUG NAMES gflags gflags_static) -+set(GFLAGS_LIB_RELEASE ${GFLAGS_LIB_DEBUG}) ++set(GFLAGS_LIB_DEBUG ${GFLAGS_HOME}/debug/lib/gflagsd.lib) ++set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/lib/gflags.lib) # ================================================== GFLAGS ================================================== # @@ -36,7 +36,7 @@ index a364d1d..1d85d50 100644 -set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/bin/retail/amd64/snappy.lib) +set(SNAPPY_HOME ${CURRENT_INSTALLED_DIR}) +set(SNAPPY_INCLUDE ${SNAPPY_HOME}/include) -+set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/debug/lib/snappy.lib) ++set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/debug/lib/snappyd.lib) +set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/lib/snappy.lib) # @@ -51,7 +51,7 @@ index a364d1d..1d85d50 100644 -set(LZ4_LIB_RELEASE ${LZ4_HOME}/bin/retail/amd64/lz4.lib) +set(LZ4_HOME ${CURRENT_INSTALLED_DIR}) +set(LZ4_INCLUDE ${LZ4_HOME}/include) -+set(LZ4_LIB_DEBUG ${LZ4_HOME}/debug/lib/lz4.lib) ++set(LZ4_LIB_DEBUG ${LZ4_HOME}/debug/lib/lz4d.lib) +set(LZ4_LIB_RELEASE ${LZ4_HOME}/lib/lz4.lib) # diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 19383f54a..161abe80e 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,4 +1,4 @@ Source: rocksdb -Version: 5.10.4-1 +Version: 5.10.4-2 Description: A library that provides an embeddable, persistent key-value store for fast storage -Build-Depends: snappy, lz4, zlib, gtest +Build-Depends: snappy, gflags, lz4, zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 740c40114..ae60e824e 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -1,9 +1,5 @@ include(vcpkg_common_functions) -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "Rocksdb only supports x64") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb @@ -41,9 +37,11 @@ vcpkg_configure_cmake( -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} + -DPORTABLE=ON + -DCMAKE_DEBUG_POSTFIX=d -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB} -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB} - -DROCKSDB_VERSION=5.10.3 + -DROCKSDB_VERSION=5.10.4 -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE |