diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-18 04:42:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 13:42:40 -0700 |
| commit | f18e0b4387571ccf2ee1e0a16509289876ff72b7 (patch) | |
| tree | 73a82f459fb9ec3c412c65a16052a95318a492fb /ports | |
| parent | 7bf7e816bdd1b9ad9149676aa5bf605f91c52137 (diff) | |
| download | vcpkg-f18e0b4387571ccf2ee1e0a16509289876ff72b7.tar.gz vcpkg-f18e0b4387571ccf2ee1e0a16509289876ff72b7.zip | |
[thrift] Update to 0.13.0 and fix OSX build (#11981)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/thrift/CONTROL | 2 | ||||
| -rw-r--r-- | ports/thrift/portfile.cmake | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index 4e15b036a..2916e3e33 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,5 +1,5 @@ Source: thrift -Version: 2020-02-08 +Version: 0.13.0 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Homepage: https://github.com/apache/thrift Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 28b234c0f..f39ba11b9 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -1,10 +1,7 @@ -include(vcpkg_common_functions) - # We currently insist on static only because: # - Thrift doesn't yet support building as a DLL on Windows, # - x64-linux only builds static anyway. # From https://github.com/apache/thrift/blob/master/CHANGES.md -# it looks like it will be supported in v0.13. vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_find_acquire_program(FLEX) @@ -13,13 +10,18 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 286eee16b147a302ddc7b10740c5e5401ebbec17 - SHA512 83aff3a51281ec43228e66b33d15b344710030ee59c1373c6cf33efae9d26db1896ae3518a23b641a7897724d496c38b5217bfc7c41ff538648ec4c571b924f5 + REF cecee50308fc7e6f77f55b3fd906c1c6c471fa2f #0.13.0 + SHA512 4097fd7951a4d47f2fadc520a54fd1b91b10769d65e899c6bab490dd7ac459e12bb2aa335df8fdfc61a32095033bfac928a54660abb1ee54ca14a144216c3339 HEAD_REF master PATCHES "correct-paths.patch" ) +if (VCPKG_TARGET_IS_OSX) + message(WARNING "${PORT} requires bison version greater than 2.5,\n\ +please use command \`brew install bison\` to install bison") +endif() + # note we specify values for WITH_STATIC_LIB and WITH_SHARED_LIB because even though # they're marked as deprecated, Thrift incorrectly hard-codes a value for BUILD_SHARED_LIBS. vcpkg_configure_cmake( @@ -44,7 +46,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/thrift RENAME copyright) +vcpkg_copy_pdbs() # Move CMake config files to the right place vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/thrift) @@ -68,4 +70,4 @@ if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) endif() -vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |