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

20240728 vendored tss #531

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

Firstyear
Copy link
Contributor

This builds on #523 to improve the README as well as improving the autoconf handling for bundled tpm2-tss.

Superhepper
Superhepper previously approved these changes Jul 30, 2024
@Superhepper
Copy link
Collaborator

Could you pull out the serde fixes out of this PR. They would be easier to get reviewed and approved.

@Firstyear
Copy link
Contributor Author

@Superhepper #538 pulled them out here.

Update bundled documentation and include macos support

Signed-off-by: William Brown <[email protected]>
@@ -9,11 +9,21 @@ fn main() {

cfg_if::cfg_if! {
if #[cfg(feature = "generate-bindings")] {
#[cfg(feature = "bundled")]
let installation = tpm2_tss::Installation::bundled();
Copy link
Member

Choose a reason for hiding this comment

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

I'm a bit stumped about how the linking and bundling is supposed to be achieved in this branch. For the else below I can see that the call to pkg_config leads to them being statically linked, but here the output_linker_arguments is 1) not "bundled"-specific, and 2) it links dynamically to those libraries. Seems that the work to prepare the libs is done, but the linking isn't?

Maybe we're just missing another conditional on cfg(feature = "bundled") to call output_linker_arguments vs pkg_config.

@Superhepper
Copy link
Collaborator

I have tried to run this locally on my Windows 11 machine with Visual Studio 2022 and I cannot get
cargo build --features="bundled generate-bindings" to work.

It crashes on line 44 in the msbuild crate where it tries to run unwrap on a None value.

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.

4 participants