Skip to content

Commit a3a7f16

Browse files
committed
Force alignment on arm32
This fixes our test failures on Debian-based arm32v7, and fixes *most* of our test failures on Alpine-based arm32v{6,7}, leaving the notable `t/restart.t` which we've had issues with prior.
1 parent 9152f80 commit a3a7f16

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

1/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1/debian/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ RUN set -eux; \
9191
cd /usr/src/memcached; \
9292
\
9393
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
94+
# https://github.com/memcached/memcached/issues/1220#issuecomment-2770251664: on arm32, we need to override the upstream alignment check (which fails to detect the need for alignment on arm32 on our hardware for some reason, which then causes us to fail the tests 😭)
95+
case "$gnuArch" in \
96+
arm-*) export ac_cv_c_alignment=need ;; \
97+
esac; \
9498
./configure \
9599
--build="$gnuArch" \
96100
--enable-extstore \

0 commit comments

Comments
 (0)