diff options
| author | Francisco Pombal <FranciscoPombal@users.noreply.github.com> | 2020-05-20 18:11:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 10:11:19 -0700 |
| commit | 8bfdf64a925d75433e721a687930c4d2d5f5620f (patch) | |
| tree | 33199109aed37e2aa8f413e4dd1458dea6a88761 | |
| parent | a29e5b6d5d4cda3f6bc315bc51ff010958b88213 (diff) | |
| download | vcpkg-8bfdf64a925d75433e721a687930c4d2d5f5620f.tar.gz vcpkg-8bfdf64a925d75433e721a687930c4d2d5f5620f.zip | |
[libtorrent] minor portfile simplification and version bump (#11389)
| -rw-r--r-- | ports/libtorrent/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libtorrent/portfile.cmake | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 12427cd8e..ba0310821 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,5 +1,5 @@ Source: libtorrent -Version: 1.2.6-2 +Version: 1.2.6-3 Homepage: https://github.com/arvidn/libtorrent Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-variant diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 05f5d8295..0ef48c6b1 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -13,14 +13,8 @@ if(VCPKG_TARGET_IS_WINDOWS) set(ICONV_PATCH "no_use_iconv.patch") endif() - # Ensure "OPENSSL_USE_STATIC_LIBS" is set to ON - # when statically linking against OpenSSL on Windows. - # Also ensure "static_runtime" will be used when statically linking against the runtime. - # Prevents OpenSSL crypt32.lib linking errors. if(VCPKG_CRT_LINKAGE STREQUAL "static") set(_static_runtime ON) - elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(_OPENSSL_USE_STATIC_LIBS ON) endif() endif() @@ -45,8 +39,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF d8be9312ec47c1c54849f846aa92530ec66266b9 # based on libtorrent-1.2.6 plus fixes from RC_1_2 branch - SHA512 b51593f090064da877a604c3bce5c3b8313aab8e7b3b14e33e5b3d9bbe9798f47948fecf5af390bba34750f13b3773a3b6a9ab04375961238d5056fe7a06c298 + REF 8b42b0413a8ff6768fd15ee91eb9656f31f27bea # based on libtorrent-1.2.6 plus fixes from RC_1_2 branch + SHA512 6dd4d60b1f13cfa07af60c553ebf1085c5306e1788c87e53a8320bf7041bc7f66aaea57c16d09468742b9bda958b5f203d08f27086c98b7f296ab429d0df20d9 HEAD_REF RC_1_2 PATCHES add-datetime-to-boost-libs.patch @@ -61,7 +55,6 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -Dboost-python-module-name=${_boost-python-module-name} -Dstatic_runtime=${_static_runtime} - -DOPENSSL_USE_STATIC_LIBS=${_OPENSSL_USE_STATIC_LIBS} -DPython3_USE_STATIC_LIBS=ON ) |