Skip to content

Commit 6d34de9

Browse files
alexwebknjaz
authored andcommitted
build armv7l images (ansible#669)
* build armv7l images * Update build-docker-images.yml * Don't use `enable-ec_nistp_64_gcc_128` on armv7l * hack? * We are an armv4 build (cherry picked from commit 519b16bd0803ea22dbd0a4525c641060581c0215)
1 parent 70d999d commit 6d34de9

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

build-scripts/manylinux-container-image/install_openssl.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ pushd openssl-${OPENSSL_VERSION}
1818
if [[ "$1" =~ '^manylinux1_.*$' ]]; then
1919
PATH=/opt/perl/bin:$PATH
2020
fi
21-
./config $OPENSSL_BUILD_FLAGS --prefix=/opt/pyca/cryptography/openssl --openssldir=/opt/pyca/cryptography/openssl
21+
BUILD_FLAGS="$OPENSSL_BUILD_FLAGS"
22+
# Can't use `$(uname -m) = "armv7l"` because that returns what kernel we're
23+
# using, and we build for armv7l with an ARM64 host.
24+
if [ "$(readelf -h /proc/self/exe | grep -o 'Machine:.* ARM')" ]; then
25+
BUILD_FLAGS="$OPENSSL_BUILD_FLAGS_ARMV7L"
26+
fi
27+
./config $BUILD_FLAGS --prefix=/opt/pyca/cryptography/openssl --openssldir=/opt/pyca/cryptography/openssl
2228
make depend
2329
make -j4
2430
# avoid installing the docs

build-scripts/manylinux-container-image/openssl-version.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export OPENSSL_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df3
33
# We need a base set of flags because on Windows using MSVC
44
# enable-ec_nistp_64_gcc_128 doesn't work since there's no 128-bit type
55
export OPENSSL_BUILD_FLAGS_WINDOWS="no-ssl3 no-ssl3-method no-zlib no-shared no-comp no-dynamic-engine"
6+
export OPENSSL_BUILD_FLAGS_ARMV7L="linux-armv4 ${OPENSSL_BUILD_FLAGS_WINDOWS}"
67
export OPENSSL_BUILD_FLAGS="${OPENSSL_BUILD_FLAGS_WINDOWS} enable-ec_nistp_64_gcc_128"

0 commit comments

Comments
 (0)