[jsonifier, discordcoreapi] Fix build hangs and warnings. (#42355)

This commit is contained in:
Billy O'Neal 2024-11-26 16:15:12 -08:00 committed by GitHub
parent be69702775
commit efb2be8def
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 33 additions and 4 deletions

View File

@ -10,8 +10,21 @@ vcpkg_from_github(
HEAD_REF main
)
# discordcoreapi consumes extreme amounts of memory (>9GB per .cpp file). With our default
# concurrency values this causes hanging and/or OOM killing on Linux build machines and
# warnings on the Windows machines like:
# #[warning]Free memory is lower than 5%; Currently used: 99.99%
# #[warning]Free memory is lower than 5%; Currently used: 99.99%
# #[warning]Free memory is lower than 5%; Currently used: 99.99%
# Cut the requested concurrency in quarter to avoid this.
if(VCPKG_CONCURRENCY GREATER 4)
math(EXPR VCPKG_CONCURRENCY "${VCPKG_CONCURRENCY} / 4")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
# Due to CMake/DCADetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target
DISABLE_PARALLEL_CONFIGURE
)
vcpkg_cmake_install()

View File

@ -1,6 +1,7 @@
{
"name": "discordcoreapi",
"version": "2.0.7",
"port-version": 1,
"description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
"homepage": "https://discordcoreapi.com",
"license": "MIT",

View File

@ -1,7 +1,7 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO realtimechris/jsonifier
REF "v${VERSION}"
REF "v${VERSION}"
SHA512 6168378a117850297fcda78853a0babd0ce7e0ca21b3e8c276acb7e75e04d85ed8909061a62e3324c309fe9e31bc59d89ea06e47853b50481843273e95172ab8
HEAD_REF main
)
@ -10,6 +10,8 @@ set(VCPKG_BUILD_TYPE release) # header-only
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
# Due to CMake/JsonifierDetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target
DISABLE_PARALLEL_CONFIGURE
)
vcpkg_cmake_install()

View File

@ -1,6 +1,7 @@
{
"name": "jsonifier",
"version": "0.9.97",
"port-version": 1,
"description": "A few classes for parsing and serializing json - very rapidly.",
"homepage": "https://github.com/realtimechris/jsonifier",
"license": "MIT",

View File

@ -289,7 +289,9 @@ directxsdk:x64-windows-static=skip
directxsdk:x64-windows-static-md=skip
discord-rpc:arm64-uwp=fail
discord-rpc:x64-uwp=fail
discordcoreapi:x64-linux=skip # cause linux CI to hang https://github.com/microsoft/vcpkg/pull/40229
# Needs newer GCC than we have
discordcoreapi:x64-linux=fail
# Needs newer standard library than we have
discordcoreapi:x64-osx=fail
discount:x64-android=fail
eathread:x64-android=fail

View File

@ -2358,7 +2358,7 @@
},
"discordcoreapi": {
"baseline": "2.0.7",
"port-version": 0
"port-version": 1
},
"discount": {
"baseline": "3.0.0d",
@ -3910,7 +3910,7 @@
},
"jsonifier": {
"baseline": "0.9.97",
"port-version": 0
"port-version": 1
},
"jsonnet": {
"baseline": "0.20.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1371e3f72145af807a144e3fadb1daf58c0b7cdd",
"version": "2.0.7",
"port-version": 1
},
{
"git-tree": "b3a2a5137d39b32f98a88f4e454b885a6097929f",
"version": "2.0.7",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5d654c9f844e2a31fdefed0d5e628d241e6451f6",
"version": "0.9.97",
"port-version": 1
},
{
"git-tree": "dfff3ea4e35d5d5df9f66101829cfe766e5b6f66",
"version": "0.9.97",