3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[qt5 components] Disable parallel build (#12529)

Browse Source 
* [qt5-imageformats] Disable parallel build

* [ompl] Disable parallel configure

* [qt5-connectivity] Disable parallel build

* [qwt] Update hash

* [qt5-location] Disable parallel build

* Update ports/qwt/portfile.cmake

* Update ports/qwt/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* [qt5] change build method to vcpkg_execute_build_process

* Add condition when there are some file conflicts

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
Jack·Boos·Yu 2020-07-31 09:12:17 -07:00 committed by GitHub
parent 2cb28482bb
commit 2b8d5bad0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/qt5-base/CONTROL
View File

@ -1,5 +1,6 @@
Source: qt5-base Source: qt5-base
Version: 5.15.0 Version: 5.15.0
Port-Version: 1
Homepage: https://www.qt.io/ Homepage: https://www.qt.io/
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)

4
ports/qt5-base/cmake/install_qt.cmake
View File

@ -4,6 +4,7 @@ function(install_qt)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(JOM) vcpkg_find_acquire_program(JOM)
set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY})
set(INVOKE_SINGLE "${JOM}" /J 1)
else() else()
find_program(MAKE make) find_program(MAKE make)
set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY}) set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY})
@ -62,8 +63,9 @@ function(install_qt)
endif() endif()
message(STATUS "Building ${_build_triplet}") message(STATUS "Building ${_build_triplet}")
vcpkg_execute_required_process( vcpkg_execute_build_process(
COMMAND ${INVOKE} COMMAND ${INVOKE}
NO_PARALLEL_COMMAND ${INVOKE_SINGLE}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet}
LOGNAME build-${_build_triplet} LOGNAME build-${_build_triplet}
) )

1
ports/qt5-connectivity/CONTROL
View File

@ -1,4 +1,5 @@
Source: qt5-connectivity Source: qt5-connectivity
Version: 5.15.0 Version: 5.15.0
Port-Version: 1
Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
Build-Depends: qt5-base[core] Build-Depends: qt5-base[core]

1
ports/qt5-imageformats/CONTROL
View File

@ -1,4 +1,5 @@
Source: qt5-imageformats Source: qt5-imageformats
Version: 5.15.0 Version: 5.15.0
Port-Version: 1
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
Build-Depends: qt5-base[core], tiff, libwebp, jasper Build-Depends: qt5-base[core], tiff, libwebp, jasper

1
ports/qt5-location/CONTROL
View File

@ -1,4 +1,5 @@
Source: qt5-location Source: qt5-location
Version: 5.15.0 Version: 5.15.0
Port-Version: 1
Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport

1
ports/qwt/CONTROL
View File

@ -1,5 +1,6 @@
Source: qwt Source: qwt
Version: 6.1.4 Version: 6.1.4
Port-Version: 1
Homepage: https://sourceforge.net/projects/qwt Homepage: https://sourceforge.net/projects/qwt
Description: Qt widgets library for technical applications Description: Qt widgets library for technical applications
Build-Depends: qt5-base[core], qt5-svg, qt5-tools Build-Depends: qt5-base[core], qt5-svg, qt5-tools

2
ports/qwt/portfile.cmake
View File

@ -31,4 +31,4 @@ file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

5
scripts/cmake/vcpkg_execute_build_process.cmake
View File

@ -61,8 +61,11 @@ function(vcpkg_execute_build_process)
OR err_contents MATCHES "LINK : fatal error LNK1102:" OR err_contents MATCHES " fatal error C1060: " OR err_contents MATCHES "LINK : fatal error LNK1102:" OR err_contents MATCHES " fatal error C1060: "
OR out_contents MATCHES "LINK : fatal error LNK1318: Unexpected PDB error; ACCESS_DENIED" OR out_contents MATCHES "LINK : fatal error LNK1318: Unexpected PDB error; ACCESS_DENIED"
OR out_contents MATCHES "LINK : fatal error LNK1104:" OR out_contents MATCHES "LINK : fatal error LNK1104:"
OR out_contents MATCHES "LINK : fatal error LNK1201:") OR out_contents MATCHES "LINK : fatal error LNK1201:"
# The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled.
OR out_contents MATCHES "Cannot create parent directory"
# Multiple threads using the same directory at the same time cause conflicts, will try again.
)
message(STATUS "Restarting Build without parallelism because memory exceeded") message(STATUS "Restarting Build without parallelism because memory exceeded")
set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out-1.log") set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out-1.log")
set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err-1.log") set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err-1.log")