build: Make the help string for --with-gui configure option unambiguous #18361
Conversation
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
This change adds the correct suffix to debug mode .pc filenames for MinGW and also to the Qt libraries listed in the `Requires` field. The filename adjustment fixes the accidental overwriting of release mode .pc files with the debug mode variant which required the wrong variant of the libraries when `debug_and_release` is active. Note that macOS also supports the `debug_and_release' configuration but may use the regular library names together with DYLD_IMAGE_SUFFIX. Creation of *_debug.pc files is turned off as they're identical to their non-debug counterparts. More info: - QTBUG-4155 - Qt commit a0d8fb4ac3cb7bafdb39f340055eacee4f957513
This change adds to the BITCOIN_QT_CONFIGURE script ability to use pkg-config for MinGW. All of the non-pkg-config paths are removed as needless. If depends is built with DEBUG=1 the configure script fails to pickup Qt: - for macOS host (similar, but not the same as issue 16391) - for Windows host (regression)
QT_STATICPLUGIN is defined in BITCOIN_QT_CONFIGURE macro.
This change removes discrepancies between the help string and actual behavior of the configure script. Also "yes" value is described explicitly.
This was referenced Mar 16, 2020
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
This was referenced Mar 16, 2020
|
The PR description has been updated on @ryanofsky's request. |
|
Thanks for updating, new description makes this much more understandable. Two things I don't understand:
|
There is a new error if value is not expected. PR description has been updated.
PR description has been updated. |
|
Rather not. Isn't Qt 6 around the corner? |
|
Closing until Qt 6. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 PR changes the help string for
--with-guioption of theconfigurescript in the following way:--with-guiis equivalent to--with-gui=qt5--with-guivalues: theconfigurescript raises an error if a value in--with-gui=valueis not expectedOn master (3d28c88):
With this PR:
Also the
QT_LIB_PREFIXvariable is removed for code simplicity and readability.This PR does not change behavior of the
configurescript for known values of the--with-guioption, and raises an error otherwise.Fix #17813
Based on #18297 (492971d..8a26848)