Qt 5.11 and static build fixes#4164
Merged
ras0219-msft merged 16 commits intomicrosoft:masterfrom Oct 22, 2018
RobertBColton:master
Merged
Qt 5.11 and static build fixes#4164ras0219-msft merged 16 commits intomicrosoft:masterfrom RobertBColton:master
ras0219-msft merged 16 commits intomicrosoft:masterfrom
RobertBColton:master
Conversation
|
|
[sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA
Contributor
|
I tested this PR but static build seems to fail on my environment. Added this patch to diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 5a29e47c..b007757d 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -61,7 +61,7 @@ set(CORE_OPTIONS
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND CORE_OPTIONS
-static
- -no-sqlite
+ -system-sqlite
)
else()
list(APPEND CORE_OPTIONS |
Contributor
Author
|
Please tell Robert to update the Chilla. |
Contributor
@RobertBColton What do you mean? |
Contributor
|
Thanks for the PR and sorry for the long delay handling this! The current status for x64-windows-static after this PR is:
However the other qt components succeed! 🎉 |
Contributor
Author
|
Please see #4332 about the chilla. |
Contributor
|
Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This updates the
qt5-baseport to build successfully under the new Qt 5.11. It also fixes the issues with respect to static building allowing the static triplet to be used.Noteworthy changes
fix-C3615.patchdeleted as it has already been sent upstream and is in Qt 5.11fix-msvc2017.patchadded to enable MSVC 2017 buildsfix-system-pcre2.patchrecreated to match newer sourcefix-system-pcre2-linux.patchrecreated to match newer sourceportfile.cmakechanged from Qt 5.9 to Qt 5.11