Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: replace rust-lzma with liblzma #536

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

ctron
Copy link
Contributor

@ctron ctron commented Jul 11, 2024

The reason for this is to have an lzma dependency, which supports vendoring.

The reason for this is to have an lzma dependency,
which supports vendoring.
@ctron ctron requested a review from jcrossley3 July 11, 2024 15:11
@ctron ctron enabled auto-merge July 11, 2024 15:29
@@ -36,7 +37,8 @@ vendored = [
"openssl/vendored",
# when using a vendored approach, we need to statically link zlib, otherwise we get some strange linker error
# unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `__stack_chk_guard@@GLIBC_2.17'
"libz-sys/static"
"libz-sys/static",
"liblzma/static",
Copy link
Contributor

@jcrossley3 jcrossley3 Jul 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change alone sufficient? Would adding this enable rust-lzma to work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, as we need to remove rust-lzma. The build.rs of rust-lzma doesn't support. a vendored version.

@helio-frota helio-frota self-requested a review July 11, 2024 17:56
@ctron ctron added this pull request to the merge queue Jul 11, 2024
Merged via the queue into trustification:main with commit cf8372a Jul 11, 2024
4 checks passed
@ctron ctron deleted the feature/liblzma_1 branch July 11, 2024 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants