build apiclient as static binary #552
Conversation
Signed-off-by: Ben Cressey <[email protected]>
The apiclient binary is copied into host containers, and can't rely on its shared libraries to exist or to be compatible versions. Signed-off-by: Ben Cressey <[email protected]>
| @@ -171,6 +174,11 @@ for p in \ | |||
| do | |||
| install -p -m 0755 ${HOME}/.cache/%{__cargo_target}/release/${p} %{buildroot}%{_cross_bindir} | |||
| done | |||
|
|
|||
| for p in apiclient ; do | |||
There was a problem hiding this comment.
| for p in apiclient ; do | |
| for static_binary in apiclient ; do |
| %cargo_build_static --manifest-path %{_builddir}/workspaces/Cargo.toml \ | ||
| -p apiclient \ | ||
| %{nil} | ||
|
|
||
| %install | ||
| install -d %{buildroot}%{_cross_bindir} | ||
| for p in \ |
There was a problem hiding this comment.
| for p in \ | |
| for dynamic_binary in \ |
| %__global_rustflags_toml [%{lua: | ||
| for arg in string.gmatch(rpm.expand("%{__global_rustflags}"), "%S+") do | ||
| # Enable dynamic linking. | ||
| %__global_rustflags_shared -Cprefer-dynamic %__global_rustflags |
There was a problem hiding this comment.
nit/confusion: shouldn't the overrides for this more specific variable come after the more general variable expands?
There was a problem hiding this comment.
I preferred it this way so the relevant changes were the first part of the definition, but I don't feel strongly.
| @@ -7,23 +7,33 @@ | |||
|
|
|||
| %__cargo %{_bindir}/cargo | |||
| %__cargo_common_opts --offline --locked --verbose | |||
| %__cargo_target %{_cross_arch}-unknown-linux-%{_cross_libc} | |||
| %__cargo_target %{_cross_arch}-unknown-linux-gnu | |||
There was a problem hiding this comment.
Is the change from _cross_libc to hardcoded "gnu" a bug fix, or is it just asserting that we'll always link to musl if static, and glibc for dynamic?
nit: should this (and cross_opts/pkg_config/env) be suffixed _shared?
There was a problem hiding this comment.
Mostly the latter. There are only a couple of %_cross_libc uses now and I may clean it all the way up at some point.
I left out the _shared suffix here since I wanted that to be the default and wanted _static to stand out when used in a spec.
Issue #, if available:
N/A
Description of changes:
apiclientis mapped into host containers, so we need to build it as a static binary to minimize its dependencies.Testing done:
Built an AMI, confirmed that
apiclientworked inside control container.By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.