From feb0a364d8d17c99b7209da3a2b331ebc011f754 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Wed, 24 Feb 2021 22:38:42 +0100
Subject: [boost] /safeseh for assembly (#16375)

* [boost] build boost on windows x86 with /safeseh

* add version files
---
 ports/boost-modular-build-helper/boost-modular-build.cmake | 5 +++++
 ports/boost-modular-build-helper/vcpkg.json                | 2 +-
 versions/b-/boost-modular-build-helper.json                | 5 +++++
 versions/baseline.json                                     | 2 +-
 4 files changed, 12 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 09daaeea3..cd97df9e9 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -307,6 +307,11 @@ function(boost_modular_build)
         list(APPEND B2_OPTIONS address-model=64 architecture=power)
     else()
         list(APPEND B2_OPTIONS address-model=32 architecture=x86)
+
+        if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+            list(APPEND B2_OPTIONS "asmflags=/safeseh")
+        endif()
+
     endif()
 
     file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT)
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 93a19943c..6d31eb2ab 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": 5,
+  "port-version": 6,
   "dependencies": [
     "boost-uninstall"
   ]
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index 1523a44b1..90aa6580a 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "71c0db71c5cdc6d6516ba3c15dfd4ad8d5e3834d",
+      "version-string": "1.75.0",
+      "port-version": 6
+    },
     {
       "git-tree": "b88a7b8df97734c03d2abaa3c562dfbfab07dbea",
       "version-string": "1.75.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index da939388d..d69bc549e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -698,7 +698,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.75.0",
-      "port-version": 5
+      "port-version": 6
     },
     "boost-move": {
       "baseline": "1.75.0",
-- 
cgit v1.2.3