Fix broken build when using system zxcvbn #10717
Merged
+20
−21
Conversation
This file contains 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
sebastianlipponer
changed the title
sebastianlipponer
force-pushed
the
develop
branch
2 times, most recently
from
2d50624
to
abb7832
Compare
sebastianlipponer
changed the title
|
Which system does this break on? We build using system zxcvbn on our Linux CI. |
|
Linux is actually affected. The reason you don't see this in CI is simply because file |
|
I see, so the provided header is used even though we are linking to the system library. |
|
Exactly, I think the CI job should be updated to remove Also, with the CMake changes I have made it should be possible to just move zxcvbn to |
|
I don't agree with tampering with the src folder for CI. But I do agree with moving to thirdparty. Can you bundle that in this PR? |
sebastianlipponer
force-pushed
the
develop
branch
4 times, most recently
from
7627cb5
to
75c5248
Compare
Fixup of zxcvbn include statement added in 5513ff5. A zxcvbn/ directory prefix breaks building with system zxcvbn. Remove this prefix to align this include statement with ones present in other files. Add zxcvbn libraries as dependency to CliTest.
sebastianlipponer
force-pushed
the
develop
branch
from
75c5248
to
e93cfbc
Compare
droidmonkey
approved these changes
May 27, 2024
pull bot
pushed a commit
to shashinma/keepassxc
that referenced
this pull request
May 28, 2024
* Fix broken build when using system zxcvbn Fixup of zxcvbn include statement added in 5513ff5. A zxcvbn/ directory prefix breaks building with system zxcvbn. Remove this prefix to align this include statement with ones present in other files. Add zxcvbn libraries as dependency to CliTest. * Move src/zxcvbn/ to src/thirdparty/zxcvbn
droidmonkey
added a commit
that referenced
this pull request
Jun 2, 2024
* Fix broken build when using system zxcvbn Fixup of zxcvbn include statement added in 5513ff5. A zxcvbn/ directory prefix breaks building with system zxcvbn. Remove this prefix to align this include statement with ones present in other files. Add zxcvbn libraries as dependency to CliTest. * Move src/zxcvbn/ to src/thirdparty/zxcvbn
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #10779.
This change is a fixup of the zxcvbn include statement added in
CliTest.cppin commit 5513ff5 . A zxcvbn/ directory prefix breaks building with system zxcvbn. Remove this prefix to align this include statement with ones present in other files. Furthermore, add zxcvbn libraries as dependency to CliTest.Move src/zxcvbn to src/thirdparty/zxcvbn.