Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[boost] update to 1.78.0 #21928

Merged
merged 44 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
246f917
[scripts] update scripts
yurybura Dec 8, 2021
d33ec4c
[boost-*] generate ports
yurybura Dec 8, 2021
63bf4bc
update versions
yurybura Dec 8, 2021
597b8d5
[scripts] update boost version in boost-modular-headers.cmake
yurybura Dec 8, 2021
65665db
Merge branch 'master' of https://github.com/microsoft/vcpkg into boos…
yurybura Dec 11, 2021
6945d51
[scripts] add post source stubs for boost-json and boost-nowide ports…
yurybura Dec 11, 2021
7a9abc7
update versions
yurybura Dec 11, 2021
a173ca6
[boost-asio] make OpenSSL optional #20718
yurybura Dec 11, 2021
c2f1863
update versions
yurybura Dec 11, 2021
c1574b3
[boost] [boost-mpi] [boost-python] disable python for iOS and Android…
yurybura Dec 12, 2021
9268246
update versions
yurybura Dec 12, 2021
70717c4
[boost-fiber] add NUMA support, fixes #16507
yurybura Dec 12, 2021
d8773d2
update version
yurybura Dec 12, 2021
824138d
[boost-build] apply patch https://github.com/bfgroup/b2/pull/113 for …
yurybura Dec 13, 2021
2e0f866
update version
yurybura Dec 13, 2021
fed886f
[boost-atomic] fix compilation for uwp
yurybura Dec 15, 2021
bccb893
update version
yurybura Dec 15, 2021
6b0ee45
Merge branch 'master' of https://github.com/microsoft/vcpkg into boos…
yurybura Dec 17, 2021
05b87d4
ignore mapnik's fail on arm64-windows
yurybura Dec 17, 2021
d6a541f
[boost-python] support ARM on Windows
yurybura Dec 17, 2021
050a121
update versions
yurybura Dec 17, 2021
7bc6ec3
Boost features testing within CI
yurybura Dec 18, 2021
403cd12
[boost-modular-build-helper] fix boost_python file name in Jamroot.jam
yurybura Dec 18, 2021
9f34a4b
[boost-mpi] fix build with python2 or python3
yurybura Dec 18, 2021
5ba0c1b
update versions
yurybura Dec 18, 2021
0f1dd2d
[boost-fiber] fix build with numa=on
yurybura Dec 18, 2021
d9a60cd
update version
yurybura Dec 18, 2021
b7229f0
[boost-multiprecision] fix build with MSVC on ARM
yurybura Dec 19, 2021
39a65f3
update version
yurybura Dec 19, 2021
888614b
[boost-mpi] try to fix build on linux and osx
yurybura Dec 22, 2021
2587559
update versions
yurybura Dec 22, 2021
5d4a75c
exclude static
yurybura Dec 22, 2021
5e31c63
Merge branch 'master' of https://github.com/microsoft/vcpkg into boos…
yurybura Dec 22, 2021
709cf51
guarantee the same result across platforms
strega-nil Dec 27, 2021
5b41af3
minor changes to boost-modular-build-helper's CMake
strega-nil Dec 27, 2021
eafa42a
correct versions
strega-nil Dec 28, 2021
ea3cc55
[boost-modular-build-helper] install Python extensions on Windows
yurybura Jan 4, 2022
1bd76fa
[boost-mpi] add patch to fix build Python extension on Windows
yurybura Jan 4, 2022
bc7c3f5
update versions
yurybura Jan 4, 2022
ddc5d23
[boost-mpi] remove python2 by request @BillyONeal @strega-nil-ms
yurybura Jan 6, 2022
09914cc
update version
yurybura Jan 6, 2022
8d0db05
Resolve conflicts
PhoebeHui Jan 7, 2022
8b882e0
Merge branch 'master' into boost-1.78.0
yurybura Jan 7, 2022
232d3d0
update versions
yurybura Jan 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions ports/boost-accumulators/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/accumulators
REF boost-1.77.0
SHA512 6d742d26ae382a753274d0c2055653d5b6368f939c0ccbd0e79283e993736a5369cdaacac648361730937dab8e5b412f265abf9f99de3c42de60baa34afe7029
REF boost-1.78.0
SHA512 b72d1d2eac58261487ec9c87a2bb6fdd0eed229c39fef62fa83b188f423e9ad96bfd6e5d177b01dec2e541d2e94ca9e548f823a05af24338d97ad98f8d85ef9c
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-accumulators/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-accumulators",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost accumulators module",
"homepage": "https://github.com/boostorg/accumulators",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-algorithm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/algorithm
REF boost-1.77.0
SHA512 1be1d06c3233d2dad2941696ecbbd77ff2d0cb3304e7a9fee4aa59bd8209ca858520d45bc67148e20defe98bf2c49ac79acf39c07bcc2b2262c1a812514d568b
REF boost-1.78.0
SHA512 1536de626708ecef49d5d059258c5f00ea5d56a5ad8526bdb867494f7749ea7af25c10d90f642cd9d25a931dde87b2ab9eea1c2a20a2531ecd9d6b7e73ad4a4a
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-algorithm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-algorithm",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost algorithm module",
"homepage": "https://github.com/boostorg/algorithm",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-align/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/align
REF boost-1.77.0
SHA512 786c63da7d5593282356dc0010a63b46b5f50236890228481c9676f543ab2d56cb5418d913bce2daad8c5bbad3feded7068ac2ab6d68481be9c25401b22ff7f6
REF boost-1.78.0
SHA512 2d7efe0a2a87942fe4e6b8e18871631c514d271f690a272e5b30e775eed60c389a2d2e7b1c6fdc7575d5ccea2d2a71a96169af60a0548d182ba9b90e5015a7b7
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-align/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-align",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost align module",
"homepage": "https://github.com/boostorg/align",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-any/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/any
REF boost-1.77.0
SHA512 cfb7987b7dbbc959012786ded23f6241640cc5b308656318e3125d5903af61f3da2dc16a8cfe811b651f65eec0455f75c8cf31426267babd344c500e20869878
REF boost-1.78.0
SHA512 fd9670fc4d7086fc28131c8d02b5dcd0d4bbcfdf54720df1859c50079d77d19d6c08a70421b1c0ec7c13f3b31b8606eaa8f8db847fd359cf03e24f913b0e660c
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-any/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-any",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost any module",
"homepage": "https://github.com/boostorg/any",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-array/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/array
REF boost-1.77.0
SHA512 e34d8e46ccb3d1efad8863a6babe59762c6cd7c5eaf45bd85402a68e445bde3202cd13c86d1ecef62d5b1855b4d32aa5d5bc62010213da38ee69b7c796669a53
REF boost-1.78.0
SHA512 1d07d224f3e0fd4a2d5beb4704d102a64e4f4f95bd6fb218c5b63b28acba8e5b3cac140505df94dab9082a0eae70e11821d827b2c586e6203562262dd9b8a1f2
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-array/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-array",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost array module",
"homepage": "https://github.com/boostorg/array",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-asio/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/asio
REF boost-1.77.0
SHA512 b7387f03994ecb22c545ed162c9622676a806cb7434e29303a72ee91e776034626cc125271439e7fa5983c76c06a887472dc3843e2a8ffca3a6ff3caee763641
REF boost-1.78.0
SHA512 78c58a64d669eaeabb5ba003200c581065412d33912e641143186ee95c11e0fb0411ed8dbb9a9acced8c8ecd258e0de33872b2e22dfc4a572315cd9a665db8a6
HEAD_REF master
PATCHES windows_alloca_header.patch
)
Expand Down
19 changes: 14 additions & 5 deletions ports/boost-asio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "boost-asio",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost asio module",
"homepage": "https://github.com/boostorg/asio",
"supports": "!emscripten",
"dependencies": [
"boost-align",
"boost-array",
Expand All @@ -24,7 +23,17 @@
"boost-throw-exception",
"boost-type-traits",
"boost-utility",
"boost-vcpkg-helpers",
"openssl"
]
"boost-vcpkg-helpers"
],
"features": {
"ssl": {
"description": "Build with SSL support",
"dependencies": [
{
"name": "openssl",
"platform": "!emscripten"
}
]
}
}
}
4 changes: 2 additions & 2 deletions ports/boost-assert/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/assert
REF boost-1.77.0
SHA512 90116861cd0457ffa61b4b2ebecc978252f74196ad87d1f756702b28b4010fe366b4dd1e6a5b3726c6926b4fb1821d9f997a758fd02f8d3be5a45ef64e104e27
REF boost-1.78.0
SHA512 8ad826aa3c3865d77d4155c4c2b318b2f6204e0861f9fb3699efa9e8c22752d6f419bba92ec0a035f3e2583aa7236d4c2ad83fdcf0cd625cc20d40690669bd2c
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-assert/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-assert",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost assert module",
"homepage": "https://github.com/boostorg/assert",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-assign/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/assign
REF boost-1.77.0
SHA512 5c72f5637f0c456a060a4204533798ceea39f95a7d96e4f9e05cdd25d178244b8a3a596a7387228df5929b1e3141724503b2579db9b546fadbb0e70648fc99e1
REF boost-1.78.0
SHA512 72cb3460624d3f4fa12859edc1086ed966ffb83be94dc22c257e088ba10c9686129baa410d7b524237794dd29c983d92c25f65fad6c7c84288275a4ca77b95e8
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-assign/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-assign",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost assign module",
"homepage": "https://github.com/boostorg/assign",
"dependencies": [
Expand Down
81 changes: 81 additions & 0 deletions ports/boost-atomic/0001-fix-compilation-for-uwp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
From bf08155d16ea8c359d1bfab6bac684cdfada4a5b Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Wed, 15 Dec 2021 02:06:11 +0300
Subject: [PATCH] Fix compilation for UWP.

UWP does not support APIs related to dynamic symbol binding and dlls.
Disable runtime detection of WaitOnAddress & co. for that target. These
APIs should be enabled at compile time on Windows 8.

Fixes https://github.com/boostorg/atomic/issues/54.
---
doc/changelog.qbk | 4 ++++
src/wait_on_address.cpp | 16 ++++++++++++++++
2 files changed, 20 insertions(+)

diff --git a/doc/changelog.qbk b/doc/changelog.qbk
index 9c370c9..ffbd902 100644
--- a/doc/changelog.qbk
+++ b/doc/changelog.qbk
@@ -7,6 +7,10 @@

[section:changelog Changelog]

+[heading Boost 1.79]
+
+* Fixed compilation for Universal Windows Platform (UWP). ([github_issue 54])
+
[heading Boost 1.78]

* Use process-local futex operations on Android for non-IPC waiting and notifying operations.
diff --git a/src/wait_on_address.cpp b/src/wait_on_address.cpp
index 7cf5bd0..6f8a165 100644
--- a/src/wait_on_address.cpp
+++ b/src/wait_on_address.cpp
@@ -25,6 +25,8 @@
#include <boost/atomic/detail/once_flag.hpp>
#include <boost/atomic/detail/wait_on_address.hpp>

+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+
#include <boost/static_assert.hpp>
#include <boost/memory_order.hpp>
#include <boost/winapi/thread.hpp>
@@ -33,6 +35,8 @@

#include <boost/atomic/detail/core_operations.hpp>

+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+
#include <boost/atomic/detail/header.hpp>

namespace boost {
@@ -43,6 +47,8 @@ BOOST_ATOMIC_DECL wait_on_address_t* wait_on_address = NULL;
BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_single = NULL;
BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_all = NULL;

+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+
BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 2u };

BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT
@@ -90,6 +96,16 @@ BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT
}
}

+#else // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+
+BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 0u };
+
+BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT
+{
+}
+
+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+
} // namespace detail
} // namespace atomics
} // namespace boost
--
2.34.1.windows.1

10 changes: 5 additions & 5 deletions ports/boost-atomic/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/atomic
REF boost-1.77.0
SHA512 fb3c0469e75eda40fd0d2a32bdc005fb0645cb52306468681a76c6ba4eaae608a5c4ad72a9363fdee6ecf432759667a850856b54500f5a4577ab34c701cf5c6a
REF boost-1.78.0
SHA512 a6eba43c7038228fa7ce537b05429e263397bc914235d9ad9aa47badce5455f4905e15e5f1979c19088b47faca3091bd0dfcdb017290f796d34a36b682592345
HEAD_REF master
PATCHES 0001-fix-compilation-for-uwp.patch
)

file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
string(REPLACE
"project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
"project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]"
"project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]"
_contents "${_contents}")
file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")

file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
message(FATAL_ERROR "boost-atomic requires a newer version of vcpkg in order to build.")
endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/boost-atomic/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-atomic",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost atomic module",
"homepage": "https://github.com/boostorg/atomic",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-beast/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/beast
REF boost-1.77.0
SHA512 e4176ff221f99e43c54b39d8e0626931941b13813374a5302dd65797745f740a791c7a22bb713d1af2e7a9a4d0d6100c0aabf4b2af2c0fa1903dc35fb5c3d0d8
REF boost-1.78.0
SHA512 6b8c46d50833265642093d612c6a1c29e764e9fbee65e8514c377390ee69469a8a170ab5829de2d0f28641d5b15d11d7f174367d3c68eb0f36dbdd2b3bd08392
HEAD_REF master
)

Expand Down
9 changes: 4 additions & 5 deletions ports/boost-beast/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{
"name": "boost-beast",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost beast module",
"homepage": "https://github.com/boostorg/beast",
"supports": "!emscripten",
"dependencies": [
{
"name": "boost-asio",
"platform": "!emscripten"
},
"boost-asio",
yurybura marked this conversation as resolved.
Show resolved Hide resolved
"boost-assert",
"boost-bind",
"boost-config",
"boost-container",
"boost-container-hash",
"boost-core",
"boost-endian",
"boost-intrusive",
Expand All @@ -23,6 +21,7 @@
"boost-static-assert",
"boost-system",
"boost-throw-exception",
"boost-type-index",
"boost-type-traits",
"boost-utility",
"boost-vcpkg-helpers",
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-bimap/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/bimap
REF boost-1.77.0
SHA512 bbb6c21d7678f49dcba4ad27d873a02a026751385a0e98633b17651183b2b25c541d18fc6ad703d8b1298137b770bdf4cc46e808c45083650f3c2db2a2d1bb28
REF boost-1.78.0
SHA512 ab681674da7c1d5cf14f93f9832d5f0010661b42dc0fff2299dd7dced026fd0a474633363d070260a57bad0b3e956431c02ab5116e7d990d04bf37cf2f274c8a
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-bimap/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-bimap",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost bimap module",
"homepage": "https://github.com/boostorg/bimap",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-bind/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/bind
REF boost-1.77.0
SHA512 ad765f5ceb327ead0c2858f0c6b3d85c3e6de2a287edecd5be8410ae8a248528c3389f78c0b37efd0eb18e5dc41492eff2b5f939c75aeeacfd1ea3745697eb57
REF boost-1.78.0
SHA512 8fc9484da8aeacd8a9fb60ad3dc061de278ae854d9abb6e513f330e38452d3af8cfa9342f185a15c7fff907b0dec02b7e54fbb8661633639aa34d9e9cd7ae7e2
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-bind/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-bind",
"version": "1.77.0",
"version": "1.78.0",
"description": "Boost bind module",
"homepage": "https://github.com/boostorg/bind",
"dependencies": [
Expand Down
Loading