From b1461da8c6adb5c51a5c12bffd628c7bbf9d68dd Mon Sep 17 00:00:00 2001
From: atkawa7 <atkawa7@yahoo.com>
Date: Thu, 29 Jun 2017 13:48:36 -0700
Subject: [rocksdb] remove static variables portfile

---
 ports/rocksdb/fix-building-both-static-and-shared.patch | 2 +-
 ports/rocksdb/portfile.cmake                            | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/ports/rocksdb/fix-building-both-static-and-shared.patch b/ports/rocksdb/fix-building-both-static-and-shared.patch
index 78b863643..c9742450b 100644
--- a/ports/rocksdb/fix-building-both-static-and-shared.patch
+++ b/ports/rocksdb/fix-building-both-static-and-shared.patch
@@ -24,7 +24,7 @@ index cbbde8e..cb19649 100644
  
 -add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
 -target_link_libraries(${ROCKSDB_STATIC_LIB}
-+if(BUILD_STATIC_LIBRARY)
++if(NOT BUILD_SHARED_LIBS)
 +  add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
 +  target_link_libraries(${ROCKSDB_STATIC_LIB}
    ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index 883e03d5b..a12ba4ca5 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -22,12 +22,6 @@ vcpkg_apply_patches(
 )
 
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-  set(BUILD_STATIC_LIBRARY ON)
-else()
-  set(BUILD_STATIC_LIBRARY OFF)
-endif()
-
 if(VCPKG_CRT_LINKAGE STREQUAL static)
   set(WITH_MD_LIBRARY OFF)
 else()
@@ -44,7 +38,6 @@ vcpkg_configure_cmake(
   -DLZ4=1
   -DZLIB=1
   -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
-  -DBUILD_STATIC_LIBRARY=${BUILD_STATIC_LIBRARY}
   -DFAIL_ON_WARNINGS=OFF
   -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY}
   OPTIONS_DEBUG
-- 
cgit v1.2.3