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

Remove dynamic allocation of atomic #2094

Merged
merged 1 commit into from
Nov 24, 2023

Conversation

BlackDex
Copy link
Contributor

@BlackDex BlackDex commented Nov 14, 2023

Since #1925 building static binaries fails because of a hardcoded dylib. Removing the dylib but still let rust search for the dependency it will still link it, but then statically.

This should still keep #1645 fixed but also fixes #2043.

I have tested this by building Vaultwarden for both dynamically linked debian based image, and a statically linked musl/alpine based image. Both are using OpenSSL v3.x.x.

Closes #2058

Since sfackler#1925 building static binaries fails because of a hardcoded `dylib`.
Removing the `dylib` but still let rust search for the dependency it
will still link it.

This should still keep sfackler#1645 fixed but also fixes sfackler#2043.

I have tested this by building Vaultwarden for both dynamically linked
debian based image, and a statically linked musl/alpine based image.
But are using OpenSSL v3.x.x.
BlackDex added a commit to BlackDex/vaultwarden that referenced this pull request Nov 14, 2023
Updated crates and adjusted code where needed.
One major update is Rocket rc4, no need anymore (again) for crates.io patching.

The only item still pending is openssl/openssl-sys for which we need to
wait if sfackler/rust-openssl#2094 will be
merged. If, then we can remove the pinned versions for the openssl crate.
dani-garcia pushed a commit to dani-garcia/vaultwarden that referenced this pull request Nov 15, 2023
* Remove another header for websocket connections

* Fix small bake issue

* Update crates

Updated crates and adjusted code where needed.
One major update is Rocket rc4, no need anymore (again) for crates.io patching.

The only item still pending is openssl/openssl-sys for which we need to
wait if sfackler/rust-openssl#2094 will be
merged. If, then we can remove the pinned versions for the openssl crate.
@BlackDex
Copy link
Contributor Author

@sfackler anything holding this back from being merged?

@sfackler
Copy link
Owner

Sorry - GMail decided to send all of my rust-openssl emails to the spam folder :(

@sfackler sfackler merged commit 5b5b8c9 into sfackler:master Nov 24, 2023
59 checks passed
@BlackDex BlackDex deleted the fix-32bit-static-build branch November 24, 2023 20:59
@BlackDex
Copy link
Contributor Author

Sorry - GMail decided to send all of my rust-openssl emails to the spam folder :(

Ah, that sux. Thanks for merging.

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.

[REGRESSION] lib atomic is loaded dynamic again on armv6 with openssl-sys v0.9.93
2 participants