From 973fa17951a78226d7c9a64f08de060b3bebd02a Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Mon, 22 Aug 2022 18:37:28 +0200
Subject: [PATCH] [boost-context] fix arm64 builds (#26444)

---
 ports/boost-context/b2-options.cmake.in | 15 +++++++++++----
 ports/boost-context/vcpkg.json          |  1 +
 versions/b-/boost-context.json          |  5 +++++
 versions/baseline.json                  |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ports/boost-context/b2-options.cmake.in b/ports/boost-context/b2-options.cmake.in
index a16d25fdbe..c54e6b9f0c 100644
--- a/ports/boost-context/b2-options.cmake.in
+++ b/ports/boost-context/b2-options.cmake.in
@@ -7,10 +7,17 @@ if(@VCPKG_TARGET_IS_WINDOWS@)
 endif()
 
 if(@VCPKG_TARGET_IS_OSX@)
-    list(APPEND B2_OPTIONS
-        abi=sysv
-        binary-format=mach-o
-    )
+    if(@VCPKG_TARGET_ARCHITECTURE@ MATCHES "^(ARM|arm)64$")
+        list(APPEND B2_OPTIONS
+            abi=aapcs
+            binary-format=mach-o
+        )
+    else()
+        list(APPEND B2_OPTIONS
+            abi=sysv
+            binary-format=mach-o
+        )
+    endif()
 endif()
 
 if("@VCPKG_TARGET_IS_LINUX@" STREQUAL "ON" OR "@VCPKG_TARGET_IS_ANDROID@" STREQUAL "ON")
diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json
index c77e45fe04..987e59c364 100644
--- a/ports/boost-context/vcpkg.json
+++ b/ports/boost-context/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-context",
   "version": "1.79.0",
+  "port-version": 1,
   "description": "Boost context module",
   "homepage": "https://github.com/boostorg/context",
   "license": "BSL-1.0",
diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json
index d809accb8c..5facde369e 100644
--- a/versions/b-/boost-context.json
+++ b/versions/b-/boost-context.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "24210ac19518ca74072938e9569a9e9f5b3476ba",
+      "version": "1.79.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7abfa63f40d05e79743c416050ed97f8351d3c37",
       "version": "1.79.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 908ed0dc09..93c66e2e83 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -630,7 +630,7 @@
     },
     "boost-context": {
       "baseline": "1.79.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-contract": {
       "baseline": "1.79.0",