resolve merge conflicts

2 files changed, 5 insertions, 362 deletions

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index c07369e2e..660f4898e 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,16 +1,3 @@
-Source: boost
-Version: 1.65.1-3
-Description: Peer-reviewed portable C++ source libraries
-Build-Depends: zlib, bzip2
-
-Feature: locale-icu
-Description: ICU backend for Boost.Locale
-Build-Depends: icu
-
-Feature: regex-icu
-Description: ICU support for Boost.Regex
-Build-Depends: icu
-
-Feature: python
-Description: a C++ library which enables seamless interoperability between C++ and the Python programming language.
-Build-Depends: python3
+Source: boost

+Version: 1.66.0

+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-context (windows), boost-conversion, boost-convert, boost-core, boost-coroutine (windows), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (windows), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (windows), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (windows), boost-local-function, boost-lockfree, boost-log (windows), boost-logic (windows), boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpi, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-optional, boost-parameter, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options (windows), boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-scope-exit, boost-serialization, boost-signals, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (windows), boost-statechart, boost-static-assert, boost-system, boost-test (windows), boost-thread (windows), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (windows), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (windows), boost-winapi, boost-xpressive

diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index fa264fa51..0283a2085 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -1,346 +1,2 @@
-include(vcpkg_common_functions)
-set(VERSION 1_65)
-set(VERSION_FULL 1_65_1)
-set(VERSION2 1.65.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_${VERSION_FULL})
-
-######################
-# Acquire and arrange sources
-######################
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://sourceforge.net/projects/boost/files/boost/${VERSION2}/boost_${VERSION_FULL}.7z" "http://dl.bintray.com/boostorg/release/${VERSION2}/source/boost_${VERSION_FULL}.7z"
-    FILENAME "boost_${VERSION_FULL}.7z"
-    SHA512 b1d9264ec74dd75c68176f5a2d2da33a2c1e3162842cc61a07ac8ed1ebb953855cece4faf72ce99b490b665e813b839e35c7fc8026f2f9cb31b106fb8bab2a9c
-)
-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_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2-2.diff"
-    SHA512 88392fcf092d07ee2de66d937634688eef1d7491a4e2fb0fce064b4e631813a0814455a329f9eed8b968ff205883751d51a86edecc8e355790fc8a35d6742483
-)
-
-FILE(READ "${DIFF}" content)
-STRING(REGEX REPLACE "include/" "" content "${content}")
-set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed)
-FILE(WRITE ${DIFF2} "${content}")
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2}
-                                                       ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-boost-ICU-support.patch)
-
-######################
-# Cleanup previous builds
-######################
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    # It is possible for a file in this folder to be locked due to antivirus or vctip
-    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-        message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\n  Files are likely in use.")
-    endif()
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    # It is possible for a file in this folder to be locked due to antivirus or vctip
-    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-        message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\n  Files are likely in use.")
-    endif()
-endif()
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug)
-    message(FATAL_ERROR "Error: directory exists: ${CURRENT_PACKAGES_DIR}/debug\n  The previous package was not fully cleared. This is an internal error.")
-endif()
-file(MAKE_DIRECTORY
-    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-
-######################
-# Bootstrap b2
-######################
-if(NOT EXISTS ${SOURCE_PATH}/b2.exe)
-    message(STATUS "Bootstrapping")
-    vcpkg_execute_required_process(
-        COMMAND "${SOURCE_PATH}/bootstrap.bat" msvc
-        WORKING_DIRECTORY ${SOURCE_PATH}
-        LOGNAME bootstrap
-    )
-endif()
-message(STATUS "Bootstrapping done")
-
-######################
-# Generate configuration
-######################
-set(B2_OPTIONS
-    -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-    -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-    -sICU_PATH="${CURRENT_INSTALLED_DIR}"
-    -j$ENV{NUMBER_OF_PROCESSORS}
-    --debug-configuration
-    --ignore-site-config
-    --hash
-    -q
-
-    threading=multi
-)
-
-# Add build type specific options
-set(B2_OPTIONS_DBG
-    -sZLIB_BINARY=zlibd
-    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-    -sBZIP2_BINARY=bz2d
-    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-)
-
-set(B2_OPTIONS_REL
-    -sZLIB_BINARY=zlib
-    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-    -sBZIP2_BINARY=bz2
-    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-)
-
-set(LIB_RUNTIME_LINK "shared")
-if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-    list(APPEND B2_OPTIONS runtime-link=shared)
-else()
-    list(APPEND B2_OPTIONS runtime-link=static)
-    set(LIB_RUNTIME_LINK "static")
-endif()
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    list(APPEND B2_OPTIONS link=shared)
-else()
-    list(APPEND B2_OPTIONS link=static)
-endif()
-
-if(TRIPLET_SYSTEM_ARCH MATCHES "x64")
-    list(APPEND B2_OPTIONS address-model=64)
-endif()
-
-if("python" IN_LIST FEATURES)
-    # Find Python. Can't use find_package here, but we already know where everything is
-    file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python[0-9.]*")
-    set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-    set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-    string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION ${PYTHON_INCLUDE_PATH})
-    list(APPEND B2_OPTIONS_DBG python-debugging=on)
-else()
-    list(APPEND B2_OPTIONS --without-python)
-endif()
-
-if("locale-icu" IN_LIST FEATURES)
-    list(APPEND B2_OPTIONS boost.locale.icu=on)
-else()
-    list(APPEND B2_OPTIONS boost.locale.icu=off)
-endif()
-
-if("regex-icu" IN_LIST FEATURES)
-    list(APPEND B2_OPTIONS --enable-icu)
-else()
-    list(APPEND B2_OPTIONS --disable-icu)
-endif()
-
-
-if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
-    list(APPEND B2_OPTIONS
-        windows-api=store
-        # --without-atomic
-        # --without-chrono
-        # --without-system
-        # --without-date_time
-        # --without-exception
-        # --without-serialization
-        # --without-context
-        # --without-graph_parallel
-        # --without-signals
-        # --without-coroutine2
-        # --without-graph
-        # --without-math
-        # --without-random
-        # --without-regex
-        ################################
-        --without-type_erasure # depends on thread
-        --without-log # depends on filesystem
-        --without-mpi # Needs "using mpi ;"
-        --without-wave # depends on filesystem
-        --without-coroutine # depends on thread
-        --without-metaparse # depends on test
-        --without-locale # libs\locale\src\encoding\wconv_codepage.ipp(114): error C3861: 'IsDBCSLeadByteEx': identifier not found
-        --without-timer # libs\timer\src\cpu_timer.cpp(126): error C2039: 'GetProcessTimes': is not a member of '`global namespace''
-        --without-program_options # libs\program_options\src\parsers.cpp(194): error C2065: 'environ': undeclared identifier
-
-        --without-test
-        --without-fiber
-        --without-stacktrace
-        --without-filesystem # libs\filesystem\src\operations.cpp(178): error C2039: 'GetEnvironmentVariableW': is not a member of '`global namespace''
-        --without-thread
-        --without-iostreams
-        --without-container
-        --without-python
-    )
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-        find_path(PATH_TO_CL cl.exe)
-        find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH)
-        if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
-            message(FATAL_ERROR "Could not find `platform.winmd` in VS2017. Do you have the Universal Windows Platform development workload installed?")
-        endif()
-    else()
-        find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "$ENV{VS140COMNTOOLS}/../../VC/LIB/store/references")
-        if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
-            message(FATAL_ERROR "Could not find `platform.winmd` in VS2015.")
-        endif()
-    endif()
-    file(TO_NATIVE_PATH "${PLATFORM_WINMD_DIR}" PLATFORM_WINMD_DIR)
-    string(REPLACE "\\" "\\\\" PLATFORM_WINMD_DIR ${PLATFORM_WINMD_DIR}) # escape backslashes
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/uwp/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam ESCAPE_QUOTES @ONLY)
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/uwp/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam ESCAPE_QUOTES @ONLY)
-else()
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
-endif()
-
-if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-    list(APPEND B2_OPTIONS toolset=msvc-14.1)
-elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
-    list(APPEND B2_OPTIONS toolset=msvc-14.0)
-else()
-    message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
-endif()
-
-set(B2_OPTIONS_DBG
-    ${B2_OPTIONS}
-    ${B2_OPTIONS_DBG}
-)
-
-set(B2_OPTIONS_REL
-    ${B2_OPTIONS}
-    ${B2_OPTIONS_REL}
-)
-
-######################
-# Perform build + Package
-######################
-message(STATUS "Building ${TARGET_TRIPLET}-rel")
-set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-vcpkg_execute_required_process_repeat(
-    COUNT 2
-    COMMAND "${SOURCE_PATH}/b2.exe"
-        --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage
-        --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        ${B2_OPTIONS_REL}
-        variant=release
-        debug-symbols=on
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}-rel
-)
-message(STATUS "Building ${TARGET_TRIPLET}-rel done")
-message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-vcpkg_execute_required_process_repeat(
-    COUNT 2
-    COMMAND "${SOURCE_PATH}/b2.exe"
-        --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage
-        --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        ${B2_OPTIONS_DBG}
-        variant=debug
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}-dbg
-)
-message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
-
-message(STATUS "Packaging headers")
-file(
-    COPY ${SOURCE_PATH}/boost
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-)
-
-# Disable Boost auto-link.
-file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-    "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n"
-)
-file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-    "\n#undef BOOST_ALL_DYN_LINK\n"
-)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-        "\n#define BOOST_ALL_DYN_LINK\n"
-    )
-endif()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
-message(STATUS "Packaging headers done")
-
-# This function makes the static build lib names match the dynamic build lib names which FindBoost.cmake is looking for by default.
-# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_63.lib).
-function(boost_rename_libs LIBS)
-    foreach(LIB ${${LIBS}})
-        get_filename_component(OLD_FILENAME ${LIB} NAME)
-        get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
-        string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
-        string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
-        string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
-        string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
-        if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
-            # nothing to do
-        elseif (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-            file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
-        else()
-            file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-        endif()
-    endforeach()
-endfunction()
-
-message(STATUS "Packaging ${TARGET_TRIPLET}-rel")
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    FILES_MATCHING PATTERN "*.lib")
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-        FILES_MATCHING PATTERN "*.dll")
-endif()
-file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib)
-
-boost_rename_libs(RELEASE_LIBS)
-message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
-
-message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    FILES_MATCHING PATTERN "*.lib")
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-        FILES_MATCHING PATTERN "*.dll")
-endif()
-file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib)
-boost_rename_libs(DEBUG_LIBS)
-message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")
-
-macro(move_to_manual_link LIBNAME)
-    if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib)
-        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-        file(RENAME
-            ${CURRENT_PACKAGES_DIR}/lib/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib
-            ${CURRENT_PACKAGES_DIR}/lib/manual-link/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib
-        )
-    endif()
-    if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/${LIBNAME}-vc140-mt-gd-${VERSION_FULL}.lib)
-        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-        file(RENAME
-            ${CURRENT_PACKAGES_DIR}/debug/lib/${LIBNAME}-vc140-mt-gd-${VERSION_FULL}.lib
-            ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/${LIBNAME}-vc140-mt-gd-${VERSION_FULL}.lib
-        )
-    endif()
-endmacro()
-
-move_to_manual_link(boost_test_exec_monitor)
-move_to_manual_link(boost_prg_exec_monitor)
-
-vcpkg_copy_pdbs()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+