mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[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>
This commit is contained in:
parent
bf2aaf9002
commit
7bc5b8cdfa
3
ports/boost-json/b2-options.cmake
Normal file
3
ports/boost-json/b2-options.cmake
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
if(APPLE)
|
||||||
|
list(APPEND B2_OPTIONS cxxstd=11)
|
||||||
|
endif()
|
@ -8,5 +8,20 @@ vcpkg_from_github(
|
|||||||
HEAD_REF master
|
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)
|
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|
||||||
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
|
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
|
||||||
|
@ -1,14 +1,23 @@
|
|||||||
{
|
{
|
||||||
"name": "boost-json",
|
"name": "boost-json",
|
||||||
"version-string": "1.75.0",
|
"version-string": "1.75.0",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Boost json module",
|
"description": "Boost json module",
|
||||||
"homepage": "https://github.com/boostorg/json",
|
"homepage": "https://github.com/boostorg/json",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"boost-align",
|
"boost-align",
|
||||||
"boost-assert",
|
"boost-assert",
|
||||||
|
{
|
||||||
|
"name": "boost-build",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
"boost-config",
|
"boost-config",
|
||||||
"boost-container",
|
"boost-container",
|
||||||
"boost-exception",
|
"boost-exception",
|
||||||
|
{
|
||||||
|
"name": "boost-modular-build-helper",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
"boost-system",
|
"boost-system",
|
||||||
"boost-throw-exception",
|
"boost-throw-exception",
|
||||||
"boost-utility",
|
"boost-utility",
|
||||||
|
@ -1,12 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "boost-python",
|
"name": "boost-python",
|
||||||
"version-string": "1.75.0",
|
"version-string": "1.75.0",
|
||||||
"port-version": 2,
|
"port-version": 3,
|
||||||
"description": "Boost python module",
|
"description": "Boost python module",
|
||||||
"homepage": "https://github.com/boostorg/python",
|
"homepage": "https://github.com/boostorg/python",
|
||||||
"supports": "!uwp & !(arm & windows) & !emscripten",
|
"supports": "!uwp & !(arm & windows) & !emscripten",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"boost-bind",
|
"boost-bind",
|
||||||
|
{
|
||||||
|
"name": "boost-build",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
"boost-compatibility",
|
"boost-compatibility",
|
||||||
"boost-config",
|
"boost-config",
|
||||||
"boost-conversion",
|
"boost-conversion",
|
||||||
@ -19,6 +23,10 @@
|
|||||||
"boost-iterator",
|
"boost-iterator",
|
||||||
"boost-lexical-cast",
|
"boost-lexical-cast",
|
||||||
"boost-math",
|
"boost-math",
|
||||||
|
{
|
||||||
|
"name": "boost-modular-build-helper",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
"boost-mpl",
|
"boost-mpl",
|
||||||
"boost-numeric-conversion",
|
"boost-numeric-conversion",
|
||||||
"boost-preprocessor",
|
"boost-preprocessor",
|
||||||
|
@ -28,9 +28,11 @@ else
|
|||||||
$port_versions = @{
|
$port_versions = @{
|
||||||
#e.g. "asio" = 1;
|
#e.g. "asio" = 1;
|
||||||
"asio" = 1;
|
"asio" = 1;
|
||||||
"python" = 2;
|
"python" = 3;
|
||||||
"context" = 2;
|
"context" = 3;
|
||||||
"concept-check" = 2;
|
"concept-check" = 2;
|
||||||
|
"regex" = 2;
|
||||||
|
"json" = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$per_port_data = @{
|
$per_port_data = @{
|
||||||
@ -291,7 +293,13 @@ foreach ($library in $libraries)
|
|||||||
"Downloading boost/$library..."
|
"Downloading boost/$library..."
|
||||||
& $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz"
|
& $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"
|
$unpacked = "$scriptsDir/libs/$library-boost-$version"
|
||||||
if (!(Test-Path $unpacked))
|
if (!(Test-Path $unpacked))
|
||||||
{
|
{
|
||||||
@ -405,7 +413,7 @@ foreach ($library in $libraries)
|
|||||||
$deps += @("boost-vcpkg-helpers")
|
$deps += @("boost-vcpkg-helpers")
|
||||||
|
|
||||||
$needsBuild = $false
|
$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 += @(
|
$deps += @(
|
||||||
@{ name="boost-build"; host=$True },
|
@{ name="boost-build"; host=$True },
|
||||||
|
7
scripts/boost/post-source-stubs/json.cmake
Normal file
7
scripts/boost/post-source-stubs/json.cmake
Normal file
@ -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")
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "cece09f870caaed77b754156a1f568ee05c9e653",
|
||||||
|
"version-string": "1.75.0",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "e32cc65f06f648018ea098e89fad7277ddacfb36",
|
"git-tree": "e32cc65f06f648018ea098e89fad7277ddacfb36",
|
||||||
"version-string": "1.75.0",
|
"version-string": "1.75.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "f5565087e1c90779cbe05bd19ba172a699ccc743",
|
||||||
|
"version-string": "1.75.0",
|
||||||
|
"port-version": 3
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "5e3040e7a2eba3e7511a5509022f5445145dd67e",
|
"git-tree": "5e3040e7a2eba3e7511a5509022f5445145dd67e",
|
||||||
"version-string": "1.75.0",
|
"version-string": "1.75.0",
|
||||||
|
@ -678,7 +678,7 @@
|
|||||||
},
|
},
|
||||||
"boost-json": {
|
"boost-json": {
|
||||||
"baseline": "1.75.0",
|
"baseline": "1.75.0",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"boost-lambda": {
|
"boost-lambda": {
|
||||||
"baseline": "1.75.0",
|
"baseline": "1.75.0",
|
||||||
@ -838,7 +838,7 @@
|
|||||||
},
|
},
|
||||||
"boost-python": {
|
"boost-python": {
|
||||||
"baseline": "1.75.0",
|
"baseline": "1.75.0",
|
||||||
"port-version": 2
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"boost-qvm": {
|
"boost-qvm": {
|
||||||
"baseline": "1.75.0",
|
"baseline": "1.75.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user