aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-07-31 09:12:17 -0700
committerGitHub <noreply@github.com>2020-07-31 09:12:17 -0700
commit2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d (patch)
tree5a15f49af829d93c3b810c08937350207a52eac1
parent2cb28482bb5f10332b3458502a3370f821b8f69c (diff)
downloadvcpkg-2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d.tar.gz
vcpkg-2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d.zip
[qt5 components] Disable parallel build (#12529)
* [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>
-rw-r--r--ports/qt5-base/CONTROL1
-rw-r--r--ports/qt5-base/cmake/install_qt.cmake4
-rw-r--r--ports/qt5-connectivity/CONTROL1
-rw-r--r--ports/qt5-imageformats/CONTROL1
-rw-r--r--ports/qt5-location/CONTROL1
-rw-r--r--ports/qwt/CONTROL1
-rw-r--r--ports/qwt/portfile.cmake2
-rw-r--r--scripts/cmake/vcpkg_execute_build_process.cmake5
8 files changed, 13 insertions, 3 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 4788f4b38..2763b32aa 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,5 +1,6 @@
Source: qt5-base
Version: 5.15.0
+Port-Version: 1
Homepage: https://www.qt.io/
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)
diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake
index a188138f4..97f2e71a2 100644
--- a/ports/qt5-base/cmake/install_qt.cmake
+++ b/ports/qt5-base/cmake/install_qt.cmake
@@ -4,6 +4,7 @@ function(install_qt)
if(CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(JOM)
set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY})
+ set(INVOKE_SINGLE "${JOM}" /J 1)
else()
find_program(MAKE make)
set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY})
@@ -62,8 +63,9 @@ function(install_qt)
endif()
message(STATUS "Building ${_build_triplet}")
- vcpkg_execute_required_process(
+ vcpkg_execute_build_process(
COMMAND ${INVOKE}
+ NO_PARALLEL_COMMAND ${INVOKE_SINGLE}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet}
LOGNAME build-${_build_triplet}
)
diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL
index 7ffc9959c..aefaea846 100644
--- a/ports/qt5-connectivity/CONTROL
+++ b/ports/qt5-connectivity/CONTROL
@@ -1,4 +1,5 @@
Source: qt5-connectivity
Version: 5.15.0
+Port-Version: 1
Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
Build-Depends: qt5-base[core]
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
index 277ba3c0c..6cc1b86ea 100644
--- a/ports/qt5-imageformats/CONTROL
+++ b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,5 @@
Source: qt5-imageformats
Version: 5.15.0
+Port-Version: 1
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
Build-Depends: qt5-base[core], tiff, libwebp, jasper
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
index ecc878edf..c0e66e5ac 100644
--- a/ports/qt5-location/CONTROL
+++ b/ports/qt5-location/CONTROL
@@ -1,4 +1,5 @@
Source: qt5-location
Version: 5.15.0
+Port-Version: 1
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
diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 4a2407b34..8353f4670 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,5 +1,6 @@
Source: qwt
Version: 6.1.4
+Port-Version: 1
Homepage: https://sourceforge.net/projects/qwt
Description: Qt widgets library for technical applications
Build-Depends: qt5-base[core], qt5-svg, qt5-tools
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index bbf03abc1..795fe53b0 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -31,4 +31,4 @@ file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake
index 9da6cec9f..67607d768 100644
--- a/scripts/cmake/vcpkg_execute_build_process.cmake
+++ b/scripts/cmake/vcpkg_execute_build_process.cmake
@@ -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 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 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.
+ 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")
set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out-1.log")
set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err-1.log")