From 9c687fd1f29dc6f5014f8288ade04bc0e6f9bcf1 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Thu, 25 Feb 2021 00:08:15 +0100 Subject: [PATCH 1/2] [boost] support build with host triplet --- ports/boost-modular-build-helper/boost-modular-build.cmake | 4 +++- ports/boost-modular-build-helper/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index cd97df9e9b06c7..fabd37373514e0 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -17,7 +17,9 @@ function(boost_modular_build) endif() # Todo: this serves too similar a purpose as vcpkg_find_acquire_program() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + if(_HOST_TRIPLET) + set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../${_HOST_TRIPLET}/tools/boost-build") + elsif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm64-linux/tools/boost-build") else() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 6d31eb2ab1f5de..78059e29156641 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.75.0", - "port-version": 6, + "port-version": 7, "dependencies": [ "boost-uninstall" ] From 6be69c12ab6fe0b6fed8fd9effaecec12c3c9c74 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Thu, 25 Feb 2021 00:08:33 +0100 Subject: [PATCH 2/2] add version files --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 90aa6580af0c31..cc21258b331c38 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8f07d079c682360605263f2f3be56a916bb72d", + "version-string": "1.75.0", + "port-version": 7 + }, { "git-tree": "71c0db71c5cdc6d6516ba3c15dfd4ad8d5e3834d", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4cc532f0cd05e1..3fe3754c4453f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -698,7 +698,7 @@ }, "boost-modular-build-helper": { "baseline": "1.75.0", - "port-version": 6 + "port-version": 7 }, "boost-move": { "baseline": "1.75.0",