diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-14 01:40:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 01:40:38 -0800 |
| commit | 6ae476dfe7c2efe7d83530e3fb9f2d96bfb9801d (patch) | |
| tree | ff2f0633d7fda360a3f59d46ecbb413bf52cab2f | |
| parent | 691c388f254ccb08e3a4d8450799981f3661541e (diff) | |
| parent | f06bf273971ffede4d2a8fefea0de383841cc8b7 (diff) | |
| download | vcpkg-6ae476dfe7c2efe7d83530e3fb9f2d96bfb9801d.tar.gz vcpkg-6ae476dfe7c2efe7d83530e3fb9f2d96bfb9801d.zip | |
Merge pull request #2193 from chwarr/bond-7.0.2
Upgrade Bond to 7.0.2
| -rw-r--r-- | ports/bond/0001_boost_static_libs.patch | 23 | ||||
| -rw-r--r-- | ports/bond/CONTROL | 2 | ||||
| -rw-r--r-- | ports/bond/portfile.cmake | 19 |
3 files changed, 9 insertions, 35 deletions
diff --git a/ports/bond/0001_boost_static_libs.patch b/ports/bond/0001_boost_static_libs.patch deleted file mode 100644 index de40a6254..000000000 --- a/ports/bond/0001_boost_static_libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/Config.cmake b/cmake/Config.cmake -index d5125c70..a2eb536c 100644 ---- a/cmake/Config.cmake -+++ b/cmake/Config.cmake -@@ -46,7 +46,7 @@ if (MSVC) - add_compile_options (/permissive-) - endif() - -- set (Boost_USE_STATIC_LIBS ON) -+ set (Boost_USE_STATIC_LIBS OFF) - endif (MSVC) - - if (WIN32) -@@ -131,9 +131,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++")) - endif() - endif() - --# disable Boost auto-linking --add_definitions (-DBOOST_ALL_NO_LIB) -- - # VS2015U2 fixed a bug with atomics and emits a warning without this definition. - add_definitions (-D_ENABLE_ATOMIC_ALIGNMENT_FIX) - diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL index e69c925d6..6680b6dd3 100644 --- a/ports/bond/CONTROL +++ b/ports/bond/CONTROL @@ -1,5 +1,5 @@ Source: bond Maintainer: bond@microsoft.com -Version: 6.0.0-1 +Version: 7.0.2 Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond> Build-Depends: boost, rapidjson diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 147ebeea8..2ad48a94d 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -4,24 +4,24 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-6.0.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-7.0.2) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/bond/archive/6.0.0.zip" - FILENAME "bond-6.0.0.zip" - SHA512 d585debabb7b74c1e85313278456bd6b63a388dbf64515c550b1d9739114b0963ffb1982d145fa4d3717747e8eba82e79ed2744a6c9e3cb1615d9a78b75b42bb + URLS "https://github.com/Microsoft/bond/archive/7.0.2.zip" + FILENAME "bond-7.0.2.zip" + SHA512 4ae3b88fafbede6c1433d171713bdbfcbed61a3d2a983d7df4e33af893a50f233be0e95c1ea8e5f30dafb017b2a8100a23721292b04184159e5fd796b1a43398 ) vcpkg_download_distfile(GBC_ARCHIVE - URLS "https://github.com/Microsoft/bond/releases/download/6.0.0/gbc-6.0.0-amd64.exe.zip" - FILENAME "gbc-6.0.0-amd64.zip" - SHA512 2aa4b5add478b952cb7733dcbf5c35634cde66812f1f1920d5fb1e2a52681a101ac6157bdba535a59316c4590fa37c74889b734106ca3e202a7a5ec0bcb1847f + URLS "https://github.com/Microsoft/bond/releases/download/7.0.2/gbc-7.0.2-amd64.exe.zip" + FILENAME "gbc-7.0.2-amd64.exe.zip" + SHA512 069eafd7641ebd719425037cb8249d2d214eb09c6ce38fbf1d1811c01d1839b0a0987c55217075b6ae9f477f750d582250134387a530edb2aee407b21d973915 ) vcpkg_extract_source_archive(${ARCHIVE}) # Extract the precompiled gbc vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/) -set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-6.0.0-amd64.exe) +set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-7.0.2-amd64.exe) if (NOT EXISTS "${FETCHED_GBC_PATH}") message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.") @@ -30,9 +30,6 @@ endif() vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES - # Change Boost_USE_STATIC_LIBS to be compatible with vcpkg's treatment - # of Boost - ${CMAKE_CURRENT_LIST_DIR}/0001_boost_static_libs.patch # Don't install rapidjson from the (empty) submodule. With vcpkg, we get # rapidjson from vcpkg ${CMAKE_CURRENT_LIST_DIR}/0002_omit_rapidjson.patch |