[boost-config] Fix boost builds for WebAssembly#20551
Merged
strega-nil-ms merged 1 commit intomicrosoft:masterfrom Oct 6, 2021
Merged
[boost-config] Fix boost builds for WebAssembly#20551strega-nil-ms merged 1 commit intomicrosoft:masterfrom
strega-nil-ms merged 1 commit intomicrosoft:masterfrom
Conversation
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
Error: Local changes detected for boost-config but no changes to version or port version.
-- Version: 1.77.0
-- Old SHA: 2a93a4c962b961f617c133389c18a994e3c27af1
-- New SHA: 8f2ed64bee882aebc33c08ecee4d43ceb9140a77
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
68c2c22 to
64ae0e4
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
Error: Local changes detected for boost-config but no changes to version or port version.
-- Version: 1.77.0
-- Old SHA: 2a93a4c962b961f617c133389c18a994e3c27af1
-- New SHA: 8f2ed64bee882aebc33c08ecee4d43ceb9140a77
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
64ae0e4 to
7e27d0d
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ff5afbab34834eaf1aebba808c47fea4fd606276 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json
index 6e93f18..0ae80a5 100644
--- a/versions/b-/boost-config.json
+++ b/versions/b-/boost-config.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "d17e033e2768f8e78783191780af9deb6c104276",
+ "version": "1.77.0",
+ "port-version": 2
+ },
{
"git-tree": "2a93a4c962b961f617c133389c18a994e3c27af1",
"version": "1.77.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3aa7be4..e606f79 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -582,7 +582,7 @@
},
"boost-config": {
"baseline": "1.77.0",
- "port-version": 0
+ "port-version": 2
},
"boost-container": {
"baseline": "1.77.0",7e27d0d to
b093e48
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ff5afbab34834eaf1aebba808c47fea4fd606276 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json
index 752cae5..49b522f 100644
--- a/versions/b-/boost-config.json
+++ b/versions/b-/boost-config.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "d17e033e2768f8e78783191780af9deb6c104276",
+ "git-tree": "8ecb52721b71f17b6f3247812e1a51658c106f74",
"version": "1.77.0",
"port-version": 1
},b093e48 to
5a9cee1
Compare
BillyONeal
requested changes
Oct 6, 2021
5a9cee1 to
bbf9c78
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout e1c8bbd3c6731cd988eb7e27d2fd0de7983e454d -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json
index 49b522f..920bf11 100644
--- a/versions/b-/boost-config.json
+++ b/versions/b-/boost-config.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "8ecb52721b71f17b6f3247812e1a51658c106f74",
+ "git-tree": "6aa6932068c1fbc812d545502f60c3a7cef80dde",
"version": "1.77.0",
"port-version": 1
},bbf9c78 to
7df8b80
Compare
BillyONeal
approved these changes
Oct 6, 2021
Contributor
|
LGTM, thanks @tobbi :) |
yurybura
pushed a commit
to yurybura/vcpkg
that referenced
this pull request
Oct 7, 2021
BillyONeal
added a commit
that referenced
this pull request
Oct 12, 2021
* [scripts/boost] fix issue #20417 [boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters * add versions * [scripts/boost] update port version after #20421 * [boost-odeint] move boost-mpi dependency to the feature * add version * [boost-modular-build-helper] rework user-config generation * [boost-python] move python3 from explicit dependency to default feature * [boost-modular-build-helper] update version * add verions * [boost-modular-build-helper] fix empty flags * update version * Fix compilation on Emscripten / WebAssembly (#20551) * [opencv4,opencv3] Control exported protobuf dependency (#20550) * Control exported protobuf dependency * Update versions * Control exported protobuf dependency * Update versions * [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422) * [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * [libffi] Don't replace string in file that doesn't exist. (#20554) * Don't replace string in file that doesn't exist. * Update per bot. * Update per bot again. * Address comments. * [json-dto] Update to 0.2.14 (#20570) * json-dto updated to v.0.2.14. * json-dto-0.2.14 added to baseline. * Change deprecated commands. * Update baseline for fresh json-dto-0.2.14. * [sail] Update to 0.9.0-pre17 (#20562) * [sail] Update to 0.9.0-pre17 * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update pre17 hash * [sail] vcpkg x-add-version --all --overwrite-version * [freexl] Update to 1.0.6 (#20520) * Reformat portfile * Minimize makefiles patch * Update to 1.0.6 * Fix uwp builds, remove skip from baseline * Install pc file for windows * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [dartsim] Update to 6.11.0 (#20566) * Update dartsim * Use newer vcpkg functions * Update version number * Update ports/dartsim/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update versions Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes * update version * [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files * update version * Resolve differences from rerunning generate-ports.ps1. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Tobias Markus <tobbi.bugs@googlemail.com> Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Lars Glud <larshg@gmail.com> Co-authored-by: eao197 <eao197@users.noreply.github.com> Co-authored-by: Dmitry Baryshev <dmitrymq@gmail.com> Co-authored-by: Akash <Ace314159@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the compilation of boost-config on WASM / emscripten (upstream patch)
What does your PR fix?
Fixes [boost-filesystem] Build failure on wasm32:emscripten #20536
Fixes [boost-date-time] Build failure on wasm32:emscripten #20537
Which triplets are supported/not supported? Have you updated the CI baseline?
all
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes