From f93b8354d1d17d4a4ef01dd75a2c813155038221 Mon Sep 17 00:00:00 2001
From: Simen August Tinderholt <simtind@users.noreply.github.com>
Date: Thu, 23 Jun 2022 23:16:30 +0200
Subject: [PATCH] [boost-modular-build-helper] Support boost architecture
 arm+x86 (#25294) (#25299)

* [boost-modular-build-helper] Support boost architecture arm+x86 (#25294)

* [boost-modular-build-helper] Update port version (#25294)

* [boost-modular-build-helper] Update boost dual architecture check (#25294)

* [boost-modular-build-helper] Update port version references(#25294)

Co-authored-by: Simen August Tinderholt <simen.tinderholt@nordicsemi.no>
---
 ports/boost-modular-build-helper/CMakeLists.txt | 2 ++
 ports/boost-modular-build-helper/vcpkg.json     | 2 +-
 versions/b-/boost-modular-build-helper.json     | 5 +++++
 versions/baseline.json                          | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index c395a4dfc2..4fb8e4eee1 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -38,6 +38,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STR
     list(APPEND B2_OPTIONS architecture=arm)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le")
     list(APPEND B2_OPTIONS architecture=power)
+elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE)
+    list(APPEND B2_OPTIONS architecture=arm+x86)
 else()
     list(APPEND B2_OPTIONS architecture=x86)
 endif()
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 04a067d595..da2d5542eb 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": "1.79.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index f79f065a70..1587b2ddd2 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e416ef5af7f6a850fd3ee6493fb3a359cd7ac6ba",
+      "version": "1.79.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca",
       "version": "1.79.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8882db88aa..8eff2acde0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -830,7 +830,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.79.0",
-      "port-version": 2
+      "port-version": 3
     },
     "boost-move": {
       "baseline": "1.79.0",