Skip to content

Commit 3b8a3c3

Browse files
committed
specfile: targeted workaround for s390x builds on c10s
Signed-off-by: John Eckersberg <[email protected]>
1 parent 4d45502 commit 3b8a3c3

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

contrib/packaging/bootc.spec

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
%global new_cargo_macros 0
2121
%endif
2222

23+
# https://issues.redhat.com/browse/RHEL-116881
24+
%if 0%{?rhel} >= 10 && "%{_build_arch}" == "s390x"
25+
%global bootc_cargo_build MALLOC_MMAP_MAX_=0 %cargo_build
26+
%else
27+
%global bootc_cargo_build %cargo_build
28+
%endif
29+
2330
Name: bootc
2431
Version: 1.1.5
2532
Release: 1%{?dist}
@@ -97,9 +104,9 @@ rm vendor-config.toml
97104
%build
98105
# Build the main bootc binary
99106
%if %new_cargo_macros
100-
%cargo_build %{?with_rhsm:-f rhsm}
107+
%bootc_cargo_build %{?with_rhsm:-f rhsm}
101108
%else
102-
%cargo_build %{?with_rhsm:--features rhsm}
109+
%bootc_cargo_build %{?with_rhsm:--features rhsm}
103110
%endif
104111

105112
# Build the system reinstallation CLI binary
@@ -109,12 +116,12 @@ export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_insta
109116
# In cargo-rpm-macros, the cargo_build macro does flag processing,
110117
# so we need to pass '--' to signify that cargo_args is not part
111118
# of the macro args
112-
%cargo_build -- %cargo_args
119+
%bootc_cargo_build -- %cargo_args
113120
%else
114121
# Older macros from rust-toolset do *not* do flag processing, so
115122
# '--' would be passed through to cargo directly, which is not
116123
# what we want.
117-
%cargo_build %cargo_args
124+
%bootc_cargo_build %cargo_args
118125
%endif
119126

120127
make manpages

0 commit comments

Comments
 (0)