Skip to content

🧪 Pre-build armv7l images for building wheels #719

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

Draft
wants to merge 7 commits into
base: devel
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/build-manylinux-container-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,15 @@ jobs:
- ARCH: ppc64le
# Build containers for s390x
- ARCH: s390x
# There are no base containers for these archs
# at https://quay.io/organization/pypa.
# Build containers for armv7l (ARM v7)
# - ARCH: armv7l
# QEMU_ARCH: arm/v7
# Build containers for ppc64
# - ARCH: ppc64
YEAR:
- _2_24
- _2_28
- _2_34
include:
- IMAGE:
ARCH: armv7l
HOST_OS: ubuntu-24.04-arm
YEAR: _2_31 # There are no base images prior to 2.31 for this arch

env:
LIBSSH_VERSION: 0.11.1
Expand Down Expand Up @@ -78,7 +76,7 @@ jobs:
Set up QEMU ${{ env.QEMU_ARCH }} arch emulation
with Podman
if: >-
!contains(fromJSON('["aarch64", "amd64"]'), env.QEMU_ARCH)
!contains(fromJSON('["aarch64", "amd64", "armv7l"]'), env.QEMU_ARCH)
run: >
sudo podman run
--rm --privileged
Expand Down
2 changes: 0 additions & 2 deletions build-scripts/manylinux-container-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ RUN \
fi

ADD build_utils.sh /root/build_utils.sh
ADD install_perl.sh /root/install_perl.sh
RUN ./install_perl.sh "${RELEASE}"
ADD install_libffi.sh /root/install_libffi.sh
RUN ./install_libffi.sh "${RELEASE}"
ADD install_openssl.sh /root/install_openssl.sh
Expand Down
2 changes: 1 addition & 1 deletion build-scripts/manylinux-container-image/install_libssh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fi
# make[2]: *** [examples/libssh_scp] Error 1
# make[1]: *** [examples/CMakeFiles/libssh_scp.dir/all] Error 2
# make: *** [all] Error 2
export LDFLAGS="-pthread -ldl"
export LDFLAGS="-pthread"

# NOTE: `PKG_CONFIG_PATH` is necessary for `cmake` to be able to locate
# NOTE: C-headers files `*.h`. Otherwise, the error is:
Expand Down
7 changes: 6 additions & 1 deletion build-scripts/manylinux-container-image/install_openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ BUILD_FLAGS="$OPENSSL_BUILD_FLAGS"
if [[ "$1" =~ '^manylinux1_.*$' ]]; then
PATH=/opt/perl/bin:$PATH
fi
# Can't use `$(uname -m) = "armv7l"` because that returns what kernel we're
# using, and we build for armv7l with an ARM64 host.
if [ "$(readelf -h /proc/self/exe | grep -o 'Machine:.* ARM')" ]; then
BUILD_FLAGS="$OPENSSL_BUILD_FLAGS_ARMV7L"
fi
if [ "$(readelf -h /proc/self/exe | grep -o 'Machine:.* S/390')" ]; then
BUILD_FLAGS="$OPENSSL_BUILD_FLAGS_S390X"
export CFLAGS="$CFLAGS -march=z10"
Expand All @@ -32,4 +37,4 @@ make -j4
# https://github.com/openssl/openssl/issues/6685#issuecomment-403838728
make install_sw install_ssldirs
popd
rm -rf openssl*
rm -rf ${OPENSSL_VERSION}
23 changes: 0 additions & 23 deletions build-scripts/manylinux-container-image/install_perl.sh

This file was deleted.

1 change: 1 addition & 0 deletions build-scripts/manylinux-container-image/openssl-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ export OPENSSL_SHA256="344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885
# We need a base set of flags because on Windows using MSVC
# enable-ec_nistp_64_gcc_128 doesn't work since there's no 128-bit type
export OPENSSL_BUILD_FLAGS_WINDOWS="no-ssl3 no-ssl3-method no-zlib no-shared no-module no-comp no-dynamic-engine no-apps no-docs no-sm2-precomp no-atexit"
export OPENSSL_BUILD_FLAGS_ARMV7L="linux-armv4 ${OPENSSL_BUILD_FLAGS_WINDOWS}"
export OPENSSL_BUILD_FLAGS_S390X="${OPENSSL_BUILD_FLAGS_WINDOWS}"
export OPENSSL_BUILD_FLAGS="${OPENSSL_BUILD_FLAGS_WINDOWS} enable-ec_nistp_64_gcc_128"
Loading