Skip to content

Commit 72ae4ca

Browse files
elmarcoPatchew Applier
authored andcommitted
RFC: tests/docker: add rust to debian-legacy-test-cross
Unfortunately, debian 11 has bindgen version 0.55... Should we install it with cargo install bindgen-cli? Linking is still failing with -lrt, despite it being present in the link arguments... Signed-off-by: Marc-André Lureau <[email protected]> Message-Id: <[email protected]>
1 parent d3be81e commit 72ae4ca

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.gitlab-ci.d/buildtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ build-legacy:
389389
variables:
390390
IMAGE: debian-legacy-test-cross
391391
TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user
392-
CONFIGURE_ARGS: --disable-tools
392+
CONFIGURE_ARGS: --disable-tools --enable-rust
393393
MAKE_CHECK_ARGS: check-tcg
394394

395395
build-user-hexagon:

tests/docker/dockerfiles/debian-legacy-test-cross.docker

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
2424
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
2525
apt install -y --no-install-recommends \
2626
bison \
27+
cargo-web \
2728
ccache \
2829
clang \
2930
flex \
@@ -36,14 +37,20 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
3637
python3-pip \
3738
python3-setuptools \
3839
python3-venv \
39-
python3-wheel && \
40+
python3-wheel \
41+
rustc-web \
42+
&& \
4043
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
4144

45+
ENV CARGO_HOME=/usr/local/cargo
46+
RUN cargo install bindgen-cli
47+
4248
RUN /usr/bin/pip3 install tomli
4349

4450
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
4551
ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user
4652
ENV MAKE /usr/bin/make
53+
ENV PATH=$CARGO_HOME/bin:$PATH
4754
# As a final step configure the user (if env is defined)
4855
ARG USER
4956
ARG UID

0 commit comments

Comments
 (0)