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.

Sign up for GitHub

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-build] Fix boost-exception for wasm32-emscripten #22497

Merged
merged 9 commits into from
Jan 19, 2022
Merged

[boost-build] Fix boost-exception for wasm32-emscripten #22497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b79ffc8
Fix boost-exception for wasm32-emscripten
Jan 12, 2022
3d73d2d
Updated port version for boost-exception
Jan 12, 2022
734e024
Updated boost-exception with x-add-version
Jan 12, 2022
a80d10f
Fixed patch
Jan 12, 2022
800c629
Boost-build x-add-version
Jan 12, 2022
ee68aca
Increment boost-build version again
Jan 12, 2022
cd5e4e9
x-add-version for boost-build
Jan 12, 2022
28599f5
Fixed boost-build port version
Jan 18, 2022
058d5bd
x-add-version for boost-build
Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/boost-build/0002-fix-get-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam
index 949e277..8934787 100644
--- a/src/tools/clang-linux.jam
+++ b/src/tools/clang-linux.jam
@@ -97,7 +97,7 @@ rule init ( version ? : command * : options * ) {

rule get-full-version ( command-string )
{
- return [ common.match-command-output version : "version ([0-9.]+)"
+ return [ common.match-command-output version : "([0-9]+.[0-9]+.[0-9]+)"
: "$(command-string) --version" ] ;
}

4 changes: 3 additions & 1 deletion ports/boost-build/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ vcpkg_from_github(
REF boost-${BOOST_VERSION}
SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324
HEAD_REF master
PATCHES 0001-don-t-skip-install-targets.patch
PATCHES
0001-don-t-skip-install-targets.patch
0002-fix-get-version.patch
)

vcpkg_download_distfile(ARCHIVE
Expand Down
1 change: 1 addition & 0 deletions ports/boost-build/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "boost-build",
"version": "1.78.0",
"port-version": 1,
"description": "Boost.Build",
"homepage": "https://github.com/boostorg/build",
"dependencies": [
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a",
"version": "1.78.0",
"port-version": 1
},
{
"git-tree": "2c0d3c35e95f99911a226c3e736c0988f1139e51",
"version": "1.78.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@
},
"boost-build": {
"baseline": "1.78.0",
"port-version": 0
"port-version": 1
},
"boost-callable-traits": {
"baseline": "1.78.0",
Expand Down