diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-05-28 20:20:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 11:20:52 -0700 |
| commit | 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 (patch) | |
| tree | c927442ea09f874be3fadd402ae5f53a4a5c27c5 /ports | |
| parent | bf2aaf9002ad98c90fd41be17275a665e113a9eb (diff) | |
| download | vcpkg-7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6.tar.gz vcpkg-7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6.zip | |
[Boost] fix not header only libs (#17372)
* [boost] don't handle compiled libs as header only ones (json/python)
* add version files
* [boost script] wait for lock to not get failure messages
* [boost-json] fix build
* add version files
* remove unnecessary changes
* Trigger Build because of #17612
* update boost asio and concept-check as requested by ci
* add version files
* Trigger Build because of #17612
* apply code review
* add version files
* fix version stuff
* Apply suggestions from code review
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
* fixes
* add version file
* fix wrong suggestion
* add version files
* Update versions/b-/boost.json
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Address the review suggestion
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/boost-json/b2-options.cmake | 3 | ||||
| -rw-r--r-- | ports/boost-json/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/boost-json/vcpkg.json | 9 | ||||
| -rw-r--r-- | ports/boost-python/vcpkg.json | 10 |
4 files changed, 36 insertions, 1 deletions
diff --git a/ports/boost-json/b2-options.cmake b/ports/boost-json/b2-options.cmake new file mode 100644 index 000000000..b05e7494f --- /dev/null +++ b/ports/boost-json/b2-options.cmake @@ -0,0 +1,3 @@ +if(APPLE)
+ list(APPEND B2_OPTIONS cxxstd=11)
+endif()
\ No newline at end of file diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 8a91cd6ca..6dbc2ee53 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -8,5 +8,20 @@ vcpkg_from_github( HEAD_REF master
)
+# see https://github.com/boostorg/json/issues/556 fore more details
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/config" "import config/checks/config")
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n <library>/boost//container/<warnings-as-errors>off" "")
+
+vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config")
+
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+ message(FATAL_ERROR "boost-json requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+boost_modular_build(
+ SOURCE_PATH ${SOURCE_PATH}
+ BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/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-json/vcpkg.json b/ports/boost-json/vcpkg.json index c11c93292..0b36bbf83 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,14 +1,23 @@ { "name": "boost-json", "version-string": "1.75.0", + "port-version": 1, "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "dependencies": [ "boost-align", "boost-assert", + { + "name": "boost-build", + "host": true + }, "boost-config", "boost-container", "boost-exception", + { + "name": "boost-modular-build-helper", + "host": true + }, "boost-system", "boost-throw-exception", "boost-utility", diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index ae32d8dd6..8751ddd8e 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,12 +1,16 @@ { "name": "boost-python", "version-string": "1.75.0", - "port-version": 2, + "port-version": 3, "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "supports": "!uwp & !(arm & windows) & !emscripten", "dependencies": [ "boost-bind", + { + "name": "boost-build", + "host": true + }, "boost-compatibility", "boost-config", "boost-conversion", @@ -19,6 +23,10 @@ "boost-iterator", "boost-lexical-cast", "boost-math", + { + "name": "boost-modular-build-helper", + "host": true + }, "boost-mpl", "boost-numeric-conversion", "boost-preprocessor", |