diff options
| author | Hongxu Xu <xuhongxu96@gmail.com> | 2019-04-20 08:05:36 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-04-19 17:05:36 -0700 |
| commit | 68759e0dfefe24c9d153c1a1eb794c8b340eb431 (patch) | |
| tree | 89efacb0a87ebaa7839e69d52509a9933f124c3a /ports | |
| parent | 45b618869d9d6d35b4fc9c845af72c33163e8ceb (diff) | |
| download | vcpkg-68759e0dfefe24c9d153c1a1eb794c8b340eb431.tar.gz vcpkg-68759e0dfefe24c9d153c1a1eb794c8b340eb431.zip | |
[rocksdb] Supported static linking in Linux (#6144)
* [rocksdb] Supported static linking in Linux
* Updated rocksdb CONTROL version
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/rocksdb/0005-static-linking-in-linux.patch | 18 | ||||
| -rw-r--r-- | ports/rocksdb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/rocksdb/portfile.cmake | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/ports/rocksdb/0005-static-linking-in-linux.patch b/ports/rocksdb/0005-static-linking-in-linux.patch new file mode 100644 index 000000000..89defde68 --- /dev/null +++ b/ports/rocksdb/0005-static-linking-in-linux.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0303186..2b09591 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -741,7 +741,12 @@ if(WIN32)
+ set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+ else()
+ set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
+- set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++
++ if(ROCKSDB_DISABLE_INSTALL_SHARED_LIB)
++ set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++ else()
++ set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++ endif()
+
+ add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES})
+ target_link_libraries(${ROCKSDB_SHARED_LIB}
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 1f47bcca8..08235d89d 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.18.3 +Version: 5.18.3-1 Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 7d96d55c2..22698dc1a 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( 0002-only-build-one-flavor.patch 0003-zlib-findpackage.patch 0004-use-find-package.patch + 0005-static-linking-in-linux.patch ) file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake") |