diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-12-21 12:14:03 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-12-21 12:14:03 -0800 |
| commit | 753a19c618dc4f763c3957a20b2421123c941fdd (patch) | |
| tree | 0c9b021765bba99470ad9e7e2a1794ef3a825b3c /ports | |
| parent | bf1045db7057f7aec614b5c8be3b729e6c5339fc (diff) | |
| parent | a24ccdfc01aba83b833af528b8f1a6ec6db020a4 (diff) | |
| download | vcpkg-753a19c618dc4f763c3957a20b2421123c941fdd.tar.gz vcpkg-753a19c618dc4f763c3957a20b2421123c941fdd.zip | |
Merge branch 'fix-linker-oom' into jasjuang-llvm
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/boost-python/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-python/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/boost-vcpkg-helpers/generate-ports.ps1 | 1 | ||||
| -rw-r--r-- | ports/qt5/CONTROL | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 645cf8b13..f59353af7 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-python
-Version: 1.66.0
+Version: 1.66.0-1
Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3
Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index beb16ad8f..395227990 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -16,4 +16,5 @@ file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python[0-9.]*") set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}")
+boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1 index cc2929ef4..11f670c7a 100644 --- a/ports/boost-vcpkg-helpers/generate-ports.ps1 +++ b/ports/boost-vcpkg-helpers/generate-ports.ps1 @@ -293,6 +293,7 @@ foreach ($library in $libraries) if ($library -eq "python")
{
$deps += @("python3")
+ $needsBuild = $true
}
elseif ($library -eq "iostreams")
{
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index ce46d249b..4d5d44ab7 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 Version: 5.8-6 Description: Qt5 application framework main components. Webengine, examples and tests not included. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre, harfbuzz, sqlite3, libpq, double-conversion +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre, harfbuzz, sqlite3, libpq, double-conversion, atlmfc (windows) |