From c50852aba0aa8df22e17133352edb432a9fc1e56 Mon Sep 17 00:00:00 2001 From: yurybura Date: Fri, 17 Jan 2020 02:10:15 +0300 Subject: [boost] Update to 1.72.0 (#9317) * [boost-python] Support Python2 as feature, fix build with installed Python2 * [boost-python] Update generate script to support Python2 mod * Re-generate boost ports * [boost-modular-build-helper] Update to 1.71. [boost-build] Update to 1.71. * [boost-modular-build-helper] Remove manual library name changing [boost-iostreams] Use boost-modular-headers.cmake script * Delete temporary file. * Revert changes in modular build script. * Update ports versions. * [boost-modular-build-helper] Fix build boost-iostreams with LZMA and ZSTD * [boost] Update to 1.72.0 * [libtorrent] Fix build with Boost 1.72.0 Original PR: https://github.com/arvidn/libtorrent/pull/4091 * Update ci.baseline.txt: - fail libgo:* due to use the removed class from Boost.Context 1.72.0 (reported issue https://github.com/yyzybb537/libgo/issues/214) - pass boost-context:arm64-windows - fix typo * Folly only supports the x64 architecture * fail boost-coroutine:arm64-windows=fail and boost-fiber:arm64-windows=fail because they use fcontext_t from Boost.Context which is not implemented for Windows on ARM64 (reported issue https://github.com/boostorg/context/issues/130) * Fix globbing-expressions * Add vcpkg_buildpath_length_warning(37) for boost-system. Revert boost-iostreams port changes. * Update ci.baseline.txt --- scripts/boost/post-source-stubs/python.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/boost/post-source-stubs/python.cmake') diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake index 40b8e0a0b..5610c489d 100644 --- a/scripts/boost/post-source-stubs/python.cmake +++ b/scripts/boost/post-source-stubs/python.cmake @@ -1,5 +1,5 @@ # 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.]*") +file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python3.*") 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}") -- cgit v1.2.3