diff options
| author | yurybura <yurybura@gmail.com> | 2020-01-17 02:10:15 +0300 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-16 15:10:15 -0800 |
| commit | c50852aba0aa8df22e17133352edb432a9fc1e56 (patch) | |
| tree | daaa75ba0aed1f1650a3c3645e5776e64cf6cdc0 /ports/boost-modular-build-helper | |
| parent | e3dfd4a9fa25c05abcf166a1b3bb260b542ed598 (diff) | |
| download | vcpkg-c50852aba0aa8df22e17133352edb432a9fc1e56.tar.gz vcpkg-c50852aba0aa8df22e17133352edb432a9fc1e56.zip | |
[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
Diffstat (limited to 'ports/boost-modular-build-helper')
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/Jamroot.jam | 4 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index c468d11f1..823e81e7f 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 1.71.0-1
+Version: 1.72.0
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index b39bdc493..688303b19 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.71.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_71 ;
+constant BOOST_VERSION : 1.72.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_72 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
import boostcpp ;
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 59db75312..391f1793c 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -151,6 +151,8 @@ function(boost_modular_build) -q
"-sZLIB_INCLUDE=${CURRENT_INSTALLED_DIR}/include"
"-sBZIP2_INCLUDE=${CURRENT_INSTALLED_DIR}/include"
+ "-sLZMA_INCLUDE=${CURRENT_INSTALLED_DIR}/include"
+ "-sZSTD_INCLUDE=${CURRENT_INSTALLED_DIR}/include"
threading=multi
)
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@@ -163,6 +165,10 @@ function(boost_modular_build) "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
-sBZIP2_BINARY=bz2d
"-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
+ -sLZMA_BINARY=lzmad
+ "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
+ -sZSTD_BINARY=zstdd
+ "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
)
set(_bm_OPTIONS_REL
@@ -170,6 +176,10 @@ function(boost_modular_build) "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
-sBZIP2_BINARY=bz2
"-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
+ -sLZMA_BINARY=lzma
+ "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
+ -sZSTD_BINARY=zstd
+ "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
)
# Properly handle compiler and linker flags passed by VCPKG
@@ -357,8 +367,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
- string(REPLACE "-1_71" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
- string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
+ string(REPLACE "-1_72" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
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})
|