From 8b941c56add1a3d0acc7d860c82b8093d73a482d Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 20 Apr 2018 18:41:24 -0700 Subject: [leveldb] Fix SOURCE_PATH. Warn before changing linkage. Other fixes --- ports/leveldb/CONTROL | 2 +- ports/leveldb/portfile.cmake | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ports/leveldb/CONTROL b/ports/leveldb/CONTROL index 5953bc35d..515d7dfea 100644 --- a/ports/leveldb/CONTROL +++ b/ports/leveldb/CONTROL @@ -1,3 +1,3 @@ Source: leveldb -Version: 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1 +Version: 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2 Description: LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values. diff --git a/ports/leveldb/portfile.cmake b/ports/leveldb/portfile.cmake index 387cfd96e..9d6892977 100644 --- a/ports/leveldb/portfile.cmake +++ b/ports/leveldb/portfile.cmake @@ -1,23 +1,20 @@ include(vcpkg_common_functions) -set(VCPKG_LIBRARY_LINKAGE static) - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/leveldb-8b1cd3753b184341e837b30383832645135d3d73) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + message(STATUS "Warning: Dynamic building not supported yet. Building static.") + set(VCPKG_LIBRARY_LINKAGE static) +endif() vcpkg_from_github( - OUT_SOURCE_PATH "leveldb" - BRANCH "bitcoin-fork" - REPO "bitcoin-core/leveldb" - REF "8b1cd3753b184341e837b30383832645135d3d73" + OUT_SOURCE_PATH SOURCE_PATH + BRANCH "bitcoin-fork" + REPO "bitcoin-core/leveldb" + REF "8b1cd3753b184341e837b30383832645135d3d73" SHA512 f5ad5fd21fb28ee052a4f3873abd58dab508c71621bcd482ab9e6ef4b57eca182c81502ddfe59736f5b2a54f2d05b397dd15982b3bd5d9039cd481eae3c7b958 ) -message(STATUS "Patching") - vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/msvc_code_fix.diff) - -message(STATUS "Building") file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -- cgit v1.2.3