diff --git a/ports/boost-build/0003-fix-emscripten.patch b/ports/boost-build/0003-fix-emscripten.patch index 1de8a56a99..31baf4ec78 100644 --- a/ports/boost-build/0003-fix-emscripten.patch +++ b/ports/boost-build/0003-fix-emscripten.patch @@ -1,32 +1,21 @@ diff --git a/src/tools/emscripten.jam b/src/tools/emscripten.jam -index d6594c5e43..8b15d0af96 100644 +index 28175f6..c3c9968 100644 --- a/src/tools/emscripten.jam +++ b/src/tools/emscripten.jam -@@ -6,6 +6,7 @@ +@@ -7,12 +7,16 @@ import feature ; import os ; import toolset ; +import generators ; import common ; - import gcc ; import type ; -@@ -37,6 +38,9 @@ rule init ( version ? : command * : options * ) + import version ; feature.extend toolset : emscripten ; +generators.override builtin.lib-generator : emscripten.prebuilt ; +generators.override emscripten.searched-lib-generator : searched-lib-generator ; + - toolset.inherit-generators emscripten emscripten - : gcc - : gcc.mingw.link gcc.mingw.link.dll gcc.compile.c.pch gcc.compile.c++.pch -@@ -53,7 +57,7 @@ toolset.inherit-flags emscripten : gcc - - type.set-generated-target-suffix EXE : emscripten : "js" ; - type.set-generated-target-suffix OBJ : emscripten : "bc" ; --type.set-generated-target-suffix STATIC_LIB : emscripten : "bc" ; -+type.set-generated-target-suffix STATIC_LIB : emscripten : "a" ; - - toolset.flags emscripten.compile OPTIONS ; - toolset.flags emscripten.compile OPTIONS ; - \ No newline at end of file + feature.feature embind : off on : propagated ; + feature.feature closure : off on full : propagated ; + feature.feature link-optimization : off on full : propagated ; diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 9aac91187e..cc38c7a771 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${VERSION} - SHA512 61540a3b2b7b6167ed8286daed4b4fde515ae9e0de81d17ef688d7972a0a6325b15afbe4e9a73ec883a81d5b86998d612cadbdc79abaf1b087a74e4e6b7cc2b5 + SHA512 332a00c39c1510ce8526e68fffe73afe9079c3e7cfb2d84471cfb9da484244cdb287b4a8d7b677ea716174aa4af5e53cfd3b6a5ebf161088b7f1296ea100a6ba HEAD_REF master PATCHES 0002-fix-get-version.patch diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index be76db4f18..c9680f01b5 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-build", "version": "1.85.0", - "port-version": 1, + "port-version": 2, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 932c6a6b7c..4760430022 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3e9d9e7c1511a3f6b18237e12b697c8d1685100", + "version": "1.85.0", + "port-version": 2 + }, { "git-tree": "930bab4ff65933cb98b0f8205340ac192e5a97fb", "version": "1.85.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9145158fbb..f7e1eba6b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -770,7 +770,7 @@ }, "boost-build": { "baseline": "1.85.0", - "port-version": 1 + "port-version": 2 }, "boost-callable-traits": { "baseline": "1.85.0",