3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 05:53:22 +08:00
Code Issues Projects Releases Wiki Activity

[boost-build] Fix wrong hash (#40041)

Browse Source 
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
Lily Wang 2024-07-23 17:59:06 -07:00 committed by GitHub
parent 4fea81d303
commit ee1093857f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/boost-build/0003-fix-emscripten.patch
View File

@ -1,32 +1,21 @@
diff --git a/src/tools/emscripten.jam b/src/tools/emscripten.jam 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 --- a/src/tools/emscripten.jam
+++ b/src/tools/emscripten.jam +++ b/src/tools/emscripten.jam
@@ -6,6 +6,7 @@ @@ -7,12 +7,16 @@
import feature ; import feature ;
import os ; import os ;
import toolset ; import toolset ;
+import generators ; +import generators ;
import common ; import common ;
import gcc ;
import type ; import type ;
@@ -37,6 +38,9 @@ rule init ( version ? : command * : options * ) import version ;
feature.extend toolset : emscripten ; feature.extend toolset : emscripten ;
+generators.override builtin.lib-generator : emscripten.prebuilt ; +generators.override builtin.lib-generator : emscripten.prebuilt ;
+generators.override emscripten.searched-lib-generator : searched-lib-generator ; +generators.override emscripten.searched-lib-generator : searched-lib-generator ;
+ +
toolset.inherit-generators emscripten <toolset>emscripten feature.feature embind : off on : propagated ;
: gcc feature.feature closure : off on full : propagated ;
: gcc.mingw.link gcc.mingw.link.dll gcc.compile.c.pch gcc.compile.c++.pch feature.feature link-optimization : off on full : propagated ;
@@ -53,7 +57,7 @@ toolset.inherit-flags emscripten : gcc
type.set-generated-target-suffix EXE : <toolset>emscripten : "js" ;
type.set-generated-target-suffix OBJ : <toolset>emscripten : "bc" ;
-type.set-generated-target-suffix STATIC_LIB : <toolset>emscripten : "bc" ;
+type.set-generated-target-suffix STATIC_LIB : <toolset>emscripten : "a" ;
toolset.flags emscripten.compile OPTIONS <flags> ;
toolset.flags emscripten.compile OPTIONS <cflags> ;

2
ports/boost-build/portfile.cmake
View File

@ -10,7 +10,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/build REPO boostorg/build
REF boost-${VERSION} REF boost-${VERSION}
SHA512 61540a3b2b7b6167ed8286daed4b4fde515ae9e0de81d17ef688d7972a0a6325b15afbe4e9a73ec883a81d5b86998d612cadbdc79abaf1b087a74e4e6b7cc2b5 SHA512 332a00c39c1510ce8526e68fffe73afe9079c3e7cfb2d84471cfb9da484244cdb287b4a8d7b677ea716174aa4af5e53cfd3b6a5ebf161088b7f1296ea100a6ba
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0002-fix-get-version.patch 0002-fix-get-version.patch

2
ports/boost-build/vcpkg.json
View File

@ -2,7 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-build", "name": "boost-build",
"version": "1.85.0", "version": "1.85.0",
"port-version": 1, "port-version": 2,
"description": "Boost.Build", "description": "Boost.Build",
"homepage": "https://github.com/boostorg/build", "homepage": "https://github.com/boostorg/build",
"license": "BSL-1.0", "license": "BSL-1.0",

5
versions/b-/boost-build.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d3e9d9e7c1511a3f6b18237e12b697c8d1685100",
"version": "1.85.0",
"port-version": 2
},
{ {
"git-tree": "930bab4ff65933cb98b0f8205340ac192e5a97fb", "git-tree": "930bab4ff65933cb98b0f8205340ac192e5a97fb",
"version": "1.85.0", "version": "1.85.0",

2
versions/baseline.json
View File

@ -770,7 +770,7 @@
}, },
"boost-build": { "boost-build": {
"baseline": "1.85.0", "baseline": "1.85.0",
"port-version": 1 "port-version": 2
}, },
"boost-callable-traits": { "boost-callable-traits": {
"baseline": "1.85.0", "baseline": "1.85.0",