diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-02-26 22:17:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 13:17:33 -0800 |
| commit | e25b620cf90d9bb311f91b03916b75d8798afd44 (patch) | |
| tree | 42bd6169b23995a60367c74a920dc0b1752c67ae | |
| parent | 82034dbd5ff7708ee1ccf5990ca0e15fb746587e (diff) | |
| download | vcpkg-e25b620cf90d9bb311f91b03916b75d8798afd44.tar.gz vcpkg-e25b620cf90d9bb311f91b03916b75d8798afd44.zip | |
[boost-context] fix linux -> windows cross compile (#16378)
* [boost-context] fix linux -> windows cross compile
* add version files
| -rw-r--r-- | ports/boost-context/b2-options.cmake.in | 7 | ||||
| -rw-r--r-- | ports/boost-context/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/boost-context/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/b-/boost-context.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
5 files changed, 23 insertions, 2 deletions
diff --git a/ports/boost-context/b2-options.cmake.in b/ports/boost-context/b2-options.cmake.in new file mode 100644 index 000000000..dbd70c94b --- /dev/null +++ b/ports/boost-context/b2-options.cmake.in @@ -0,0 +1,7 @@ +
+if(@VCPKG_TARGET_IS_WINDOWS@)
+ list(APPEND B2_OPTIONS
+ abi=ms
+ binary-format=pe
+ )
+endif()
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index dd4c347ba..355839869 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -15,7 +15,15 @@ file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
+configure_file(
+ "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"
+ "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
+ @ONLY
+)
+boost_modular_build(
+ SOURCE_PATH ${SOURCE_PATH}
+ BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
+)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 95ee33e38..c015df9d7 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-context", "version-string": "1.75.0", + "port-version": 1, "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index a379f68d3..7be7af70e 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7f3c7f2174e6d43195a6468272d27bf68b12b56b", + "version-string": "1.75.0", + "port-version": 1 + }, + { "git-tree": "a122c48db7645becfa084e9af1e57035870cb806", "version-string": "1.75.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index 07fa06c7b..812beabe2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -494,7 +494,7 @@ }, "boost-context": { "baseline": "1.75.0", - "port-version": 0 + "port-version": 1 }, "boost-contract": { "baseline": "1.75.0", |