Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Boost] fix not header only libs #17372

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ports/boost-json/b2-options.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
if(APPLE)
list(APPEND B2_OPTIONS cxxstd=11)
endif()
15 changes: 15 additions & 0 deletions ports/boost-json/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
9 changes: 9 additions & 0 deletions ports/boost-json/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 9 additions & 1 deletion ports/boost-python/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
16 changes: 12 additions & 4 deletions scripts/boost/generate-ports.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ else
$port_versions = @{
#e.g. "asio" = 1;
"asio" = 1;
"python" = 2;
"context" = 2;
"python" = 3;
"context" = 3;
"concept-check" = 2;
"regex" = 2;
autoantwort marked this conversation as resolved.
Show resolved Hide resolved
"json" = 1;
}

$per_port_data = @{
Expand Down Expand Up @@ -291,7 +293,13 @@ foreach ($library in $libraries)
"Downloading boost/$library..."
& $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz"
}
$hash = & $vcpkg hash $archive
$hash = & $vcpkg --x-wait-for-lock hash $archive
# remove prefix "Waiting to take filesystem lock on <path>/.vcpkg-root... "
if($hash -is [Object[]])
{
$hash = $hash[1]
}

$unpacked = "$scriptsDir/libs/$library-boost-$version"
if (!(Test-Path $unpacked))
{
Expand Down Expand Up @@ -405,7 +413,7 @@ foreach ($library in $libraries)
$deps += @("boost-vcpkg-helpers")

$needsBuild = $false
if ((Test-Path $unpacked/build/Jamfile.v2) -and $library -ne "metaparse" -and $library -ne "graph_parallel")
if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "(metaparse|graph_parallel|function_types)")
{
$deps += @(
@{ name="boost-build"; host=$True },
Expand Down
7 changes: 7 additions & 0 deletions scripts/boost/post-source-stubs/json.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# 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")
5 changes: 5 additions & 0 deletions versions/b-/boost-json.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cece09f870caaed77b754156a1f568ee05c9e653",
"version-string": "1.75.0",
"port-version": 1
},
{
"git-tree": "e32cc65f06f648018ea098e89fad7277ddacfb36",
"version-string": "1.75.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-python.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f5565087e1c90779cbe05bd19ba172a699ccc743",
"version-string": "1.75.0",
"port-version": 3
},
{
"git-tree": "5e3040e7a2eba3e7511a5509022f5445145dd67e",
"version-string": "1.75.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
},
"boost-json": {
"baseline": "1.75.0",
"port-version": 0
"port-version": 1
},
"boost-lambda": {
"baseline": "1.75.0",
Expand Down Expand Up @@ -830,7 +830,7 @@
},
"boost-python": {
"baseline": "1.75.0",
"port-version": 2
"port-version": 3
},
"boost-qvm": {
"baseline": "1.75.0",
Expand Down