diff options
| author | Jens Frederich <jfrederich@gmail.com> | 2016-10-25 14:07:12 +0200 |
|---|---|---|
| committer | Jens Frederich <jfrederich@gmail.com> | 2016-10-25 14:07:12 +0200 |
| commit | 4681f3de604f6b4af5c34e0ef9b8119574e3549b (patch) | |
| tree | 229ac681678a602f43f93b9c49c283ba727fe1cd | |
| parent | 7ed2525767f1e7c79f8439d3bc7092ecfaa4f581 (diff) | |
| download | vcpkg-4681f3de604f6b4af5c34e0ef9b8119574e3549b.tar.gz vcpkg-4681f3de604f6b4af5c34e0ef9b8119574e3549b.zip | |
[think-cell-range] move boost range hotfix to boost portfile
Signed-off-by: Jens Frederich <jfrederich@gmail.com>
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 13 | ||||
| -rw-r--r-- | ports/think-cell-range/portfile.cmake | 5 |
3 files changed, 13 insertions, 7 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index fc0f3cef7..4c4942752 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,3 @@ Source: boost -Version: 1.62 +Version: 1.62-1 Description: Peer-reviewed portable C++ source libraries diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 43dde456a..783606f72 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -9,6 +9,17 @@ vcpkg_download_distfile(ARCHIVE_FILE ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) +# apply boost range hotfix +vcpkg_download_distfile(DIFF + URLS "https://github.com/boostorg/range/commit/e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff" + FILENAME "boost-range-has_range_interator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff" + SHA512 77dad42bfd9bbab2bbddf361d5b7ad3dd6f812f4294c6dd1a677bb4d0191a4fff43bca32fdd4fce05d428562abb6e38afd0fd33ca6a8b5f28481d70cd2f3dd67 +) +FILE(READ "${DIFF}" content) +STRING(REGEX REPLACE "include/" "" content "${content}") +FILE(WRITE ${DIFF} "${content}") +vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF}) + if(NOT EXISTS ${SOURCE_PATH}/b2.exe) message(STATUS "Bootstrapping") vcpkg_execute_required_process( @@ -116,4 +127,4 @@ elseif() endif() message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/think-cell-range/portfile.cmake b/ports/think-cell-range/portfile.cmake index c5537546e..81dc0eea4 100644 --- a/ports/think-cell-range/portfile.cmake +++ b/ports/think-cell-range/portfile.cmake @@ -14,8 +14,3 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/think-cell-range/COPYING ${CURRENT_PAC file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) file(COPY ${SOURCE_PATH}/range/range.example.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_INSTALLED_DIR}/include - PATCHES "${SOURCE_PATH}/boost_patches/has_range_iterator.patch" -) |