From b79ffc8e4ac4638f039e8b7397137d48c754a85f Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 01:37:58 -0500 Subject: [PATCH 1/9] Fix boost-exception for wasm32-emscripten --- ports/boost-build/0002-fix-get-version.patch | 13 +++++++++++++ ports/boost-build/portfile.cmake | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ports/boost-build/0002-fix-get-version.patch diff --git a/ports/boost-build/0002-fix-get-version.patch b/ports/boost-build/0002-fix-get-version.patch new file mode 100644 index 00000000000000..1d4808b2c303c0 --- /dev/null +++ b/ports/boost-build/0002-fix-get-version.patch @@ -0,0 +1,13 @@ +diff --git a/tools/clang-linux.jam b/tools/clang-linux.jam +index 949e277..8934787 100644 +--- a/tools/clang-linux.jam ++++ b/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" ] ; + } + diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 2f3bc7a08020df..4183396131d87f 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -12,7 +12,7 @@ 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 From 3d73d2db69e71f9813650b292eb492dfb7ef1429 Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 01:44:47 -0500 Subject: [PATCH 2/9] Updated port version for boost-exception --- ports/boost-build/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 6cb3ff14aaebd4..a425121de423a4 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-build", "version": "1.78.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ From 734e024a9617be700634fcc9145557cc9e18f0be Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 01:45:20 -0500 Subject: [PATCH 3/9] Updated boost-exception with x-add-version --- versions/b-/boost-build.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 533afa41585168..4f8bfa15145a6a 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b056cc4ec512fda610c9a46ed074136f87fe5784", + "version": "1.78.0", + "port-version": 1 + }, { "git-tree": "2c0d3c35e95f99911a226c3e736c0988f1139e51", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8e9a13b5bdda03..3f6e52338b2b2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -574,7 +574,7 @@ }, "boost-build": { "baseline": "1.78.0", - "port-version": 0 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.78.0", From a80d10f141279b54230037ffe1da1fbd21d9a845 Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 13:50:03 -0500 Subject: [PATCH 4/9] Fixed patch --- ports/boost-build/0002-fix-get-version.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/boost-build/0002-fix-get-version.patch b/ports/boost-build/0002-fix-get-version.patch index 1d4808b2c303c0..cf35e7831c1e6c 100644 --- a/ports/boost-build/0002-fix-get-version.patch +++ b/ports/boost-build/0002-fix-get-version.patch @@ -1,7 +1,7 @@ -diff --git a/tools/clang-linux.jam b/tools/clang-linux.jam +diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam index 949e277..8934787 100644 ---- a/tools/clang-linux.jam -+++ b/tools/clang-linux.jam +--- 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 ) From 800c6297b7b41e9c7c5b789a47566ec0189c1b9a Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 13:51:02 -0500 Subject: [PATCH 5/9] Boost-build x-add-version --- ports/boost-build/vcpkg.json | 2 +- versions/b-/boost-build.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index a425121de423a4..8911bca80635cc 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-build", "version": "1.78.0", - "port-version": 1, + "port-version": 2, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 4f8bfa15145a6a..17dfd09e33cc92 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caada466764a8c06ee4e856b8a1c32745e1b5174", + "version": "1.78.0", + "port-version": 2 + }, { "git-tree": "b056cc4ec512fda610c9a46ed074136f87fe5784", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3f6e52338b2b2e..d9e652b9a27992 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -574,7 +574,7 @@ }, "boost-build": { "baseline": "1.78.0", - "port-version": 1 + "port-version": 2 }, "boost-callable-traits": { "baseline": "1.78.0", From ee68acab16a9ce324d8e293f6c352efb21aeab35 Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 18:35:41 -0500 Subject: [PATCH 6/9] Increment boost-build version again --- ports/boost-build/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 8911bca80635cc..8c0fd8705d6c5a 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-build", "version": "1.78.0", - "port-version": 2, + "port-version": 3, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ From cd5e4e991b51e0915b8b41eae41cfa351313249d Mon Sep 17 00:00:00 2001 From: Semphris Date: Wed, 12 Jan 2022 18:36:11 -0500 Subject: [PATCH 7/9] x-add-version for boost-build --- versions/b-/boost-build.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 17dfd09e33cc92..aa89211fe9d71f 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a97c74b446de1829ea4b11d0b0b99f7081267c4d", + "version": "1.78.0", + "port-version": 3 + }, { "git-tree": "caada466764a8c06ee4e856b8a1c32745e1b5174", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index d9e652b9a27992..f79c95688f8725 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -574,7 +574,7 @@ }, "boost-build": { "baseline": "1.78.0", - "port-version": 2 + "port-version": 3 }, "boost-callable-traits": { "baseline": "1.78.0", From 28599f5a1492d5eda068b6efece49a6dcc052d86 Mon Sep 17 00:00:00 2001 From: Semphris Date: Tue, 18 Jan 2022 12:32:28 -0500 Subject: [PATCH 8/9] Fixed boost-build port version --- ports/boost-build/portfile.cmake | 4 +++- ports/boost-build/vcpkg.json | 2 +- versions/b-/boost-build.json | 10 ---------- versions/baseline.json | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 4183396131d87f..ec913ceaf73ed0 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -12,7 +12,9 @@ vcpkg_from_github( REF boost-${BOOST_VERSION} SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324 HEAD_REF master - PATCHES 0001-don-t-skip-install-targets.patch 0002-fix-get-version.patch + PATCHES + 0001-don-t-skip-install-targets.patch + 0002-fix-get-version.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 8c0fd8705d6c5a..a425121de423a4 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-build", "version": "1.78.0", - "port-version": 3, + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index aa89211fe9d71f..f94d6b71ad55d6 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -3,16 +3,6 @@ { "git-tree": "a97c74b446de1829ea4b11d0b0b99f7081267c4d", "version": "1.78.0", - "port-version": 3 - }, - { - "git-tree": "caada466764a8c06ee4e856b8a1c32745e1b5174", - "version": "1.78.0", - "port-version": 2 - }, - { - "git-tree": "b056cc4ec512fda610c9a46ed074136f87fe5784", - "version": "1.78.0", "port-version": 1 }, { diff --git a/versions/baseline.json b/versions/baseline.json index f79c95688f8725..3f6e52338b2b2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -574,7 +574,7 @@ }, "boost-build": { "baseline": "1.78.0", - "port-version": 3 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.78.0", From 058d5bd88602dc16fc2c3b50dff4c31c1f4aee5e Mon Sep 17 00:00:00 2001 From: Semphris Date: Tue, 18 Jan 2022 14:26:24 -0500 Subject: [PATCH 9/9] x-add-version for boost-build --- versions/b-/boost-build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index f94d6b71ad55d6..140b50fd32d20b 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a97c74b446de1829ea4b11d0b0b99f7081267c4d", + "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", "version": "1.78.0", "port-version": 1 },