[vcpkg baseline][hpx] Provide the correct dependencies when hpx chooses to use tcmalloc (#21673)

* [hpx] Always use the system malloc.

* Use tcmalloc rather than the system malloc when targeting Linux as requested by the hpx maintainers.
This commit is contained in:
Billy O'Neal 2021-11-29 08:40:37 -08:00 committed by GitHub
parent 3a68454afa
commit b6b0e29209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 2 deletions

View File

@ -9,6 +9,15 @@ vcpkg_from_github(
HEAD_REF stable
)
set(HPX_WITH_MALLOC system)
if(VCPKG_TARGET_IS_LINUX)
# This is done at the request of the hpx maintainers; see
# https://github.com/microsoft/vcpkg/pull/21673#issuecomment-979904882
# It must match when gperftools is treated as a dependency of this port.
set(HPX_WITH_MALLOC tcmalloc)
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
@ -17,6 +26,7 @@ vcpkg_cmake_configure(
-DHPX_WITH_EXAMPLES=OFF
-DHPX_WITH_TOOLS=OFF
-DHPX_WITH_RUNTIME=OFF
"-DHPX_WITH_MALLOC=${HPX_WITH_MALLOC}"
)
vcpkg_cmake_install()

View File

@ -1,7 +1,7 @@
{
"name": "hpx",
"version-semver": "1.7.1",
"port-version": 1,
"port-version": 2,
"description": [
"The C++ Standards Library for Concurrency and Parallelism",
"HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case."
@ -23,6 +23,10 @@
"boost-throw-exception",
"boost-variant",
"boost-winapi",
{
"name": "gperftools",
"platform": "linux"
},
"hwloc",
{
"name": "vcpkg-cmake",

View File

@ -2698,7 +2698,7 @@
},
"hpx": {
"baseline": "1.7.1",
"port-version": 1
"port-version": 2
},
"http-parser": {
"baseline": "2.9.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e3376f2a4ca78e32a29511450453e154cdb08a2a",
"version-semver": "1.7.1",
"port-version": 2
},
{
"git-tree": "739c83940b3bc753e7b1ada7192dd0c36970c9f5",
"version-semver": "1.7.1",