diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-08-09 12:26:37 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-08-09 16:36:21 +0200 |
| commit | a58110bb7a3fa2a112085ce378f508b39e4f7096 (patch) | |
| tree | 6917eba1251b2795e92c90f78838dc4ad28e00a6 | |
| parent | 7e44903a7e1bb30947867b267faae959888e214e (diff) | |
| download | justbuild-a58110bb7a3fa2a112085ce378f508b39e4f7096.tar.gz | |
Update fmt library
| -rw-r--r-- | etc/repos.json | 10 | ||||
| -rw-r--r-- | src/buildtool/execution_api/remote/config.hpp | 3 | ||||
| -rwxr-xr-x | test/bootstrap/test-mixed-bootstrap.sh | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/etc/repos.json b/etc/repos.json index 8272fe8c..7bad1559 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -211,11 +211,11 @@ , "fmt": { "repository": { "type": "zip" - , "content": "558d83d0fedb1f1ee3c3c4f1576d549cae7614ed" - , "fetch": "https://github.com/fmtlib/fmt/releases/download/9.1.0/fmt-9.1.0.zip" - , "sha256": "cceb4cb9366e18a5742128cb3524ce5f50e88b476f1e54737a47ffdf4df4c996" - , "sha512": "482d1ceaf042e97c66ff570babe9bd6f9cab7e4eec3dc56eb7d5e075b6b9b16f8eb333e96de9627fa33324d32b88d2aacebd0c34c3c706650eaa1729b0dd7fd6" - , "subdir": "fmt-9.1.0" + , "content": "3af42ee467295259c9bd6533f1092268136b226d" + , "fetch": "https://github.com/fmtlib/fmt/releases/download/10.0.0/fmt-10.0.0.zip" + , "sha256": "4943cb165f3f587f26da834d3056ee8733c397e024145ca7d2a8a96bb71ac281" + , "sha512": "e4f80c34a78490a6bb3fa79fe097dac3d660dc7900fdeac9f8e744c1f1ff414c0a54a9b8a61fc9631702b12aaaa77000673357545e5771872076154810ebbbfc" + , "subdir": "fmt-10.0.0" } , "target_root": "import targets" , "target_file_name": "TARGETS.fmt" diff --git a/src/buildtool/execution_api/remote/config.hpp b/src/buildtool/execution_api/remote/config.hpp index 55c96a46..449e9506 100644 --- a/src/buildtool/execution_api/remote/config.hpp +++ b/src/buildtool/execution_api/remote/config.hpp @@ -68,7 +68,8 @@ class RemoteExecutionConfig { Port port{}; [[nodiscard]] auto ToJson() const noexcept -> nlohmann::json { - return nlohmann::json{fmt::format("{}:{}", host, port)}; + return nlohmann::json{ + fmt::format("{}:{}", host, static_cast<std::uint16_t>(port))}; } }; diff --git a/test/bootstrap/test-mixed-bootstrap.sh b/test/bootstrap/test-mixed-bootstrap.sh index d43a6a58..981116c4 100755 --- a/test/bootstrap/test-mixed-bootstrap.sh +++ b/test/bootstrap/test-mixed-bootstrap.sh @@ -44,7 +44,7 @@ cp distdir/v4.0.0.tar.gz "${DISTDIR}" # - fmt rm -rf "${LOCALBASE}/include/fmt*" rm -rf "${LOCALBASE}/lib/libfmt*" -cp distdir/fmt-9.1.0.zip "${DISTDIR}" +cp distdir/fmt-10.0.0.zip "${DISTDIR}" # bootstrap command |